layerscape: add patches-5.4
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0306-staging-fsl_ppfe-eth-resolve-indentation-warning.patch
1 From 1af2e375a76c55d227b7d1b1f1ba1c9cf850946a Mon Sep 17 00:00:00 2001
2 From: Calvin Johnson <calvin.johnson@nxp.com>
3 Date: Thu, 4 Oct 2018 09:39:00 +0530
4 Subject: [PATCH] staging: fsl_ppfe/eth: resolve indentation warning
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 Resolve the following indentation warning:
10
11 drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c:
12 In function ‘pfe_get_gemac_if_proprties’:
13 drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c:96:2:
14 warning: this ‘else’ clause does not guard...
15 [-Wmisleading-indentation]
16 else
17 ^~~~
18 drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c:98:3:
19 note: ...this statement, but the latter is misleadingly indented as
20 if it were guarded by the ‘else’
21 pdata->ls1012a_eth_pdata[port].mdio_muxval = phy_id;
22 ^~~~~
23
24 Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
25 ---
26 drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c | 5 +++--
27 1 file changed, 3 insertions(+), 2 deletions(-)
28
29 --- a/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
30 +++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
31 @@ -89,11 +89,12 @@ static int pfe_get_gemac_if_proprties(st
32 }
33
34 addr = of_get_property(gem, "fsl,mdio-mux-val", &size);
35 - if (!addr)
36 + if (!addr) {
37 pr_err("%s: Invalid mdio-mux-val....\n", __func__);
38 - else
39 + } else {
40 phy_id = be32_to_cpup(addr);
41 pdata->ls1012a_eth_pdata[port].mdio_muxval = phy_id;
42 + }
43
44 if (pdata->ls1012a_eth_pdata[port].phy_id < 32)
45 pfe->mdio_muxval[pdata->ls1012a_eth_pdata[port].phy_id] =