mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 19:23:53 +02:00
e06544bdbe
The change which backported the of_get_mac_address() change broke some
patches in the layerscape target so the patches did not apply any more.
This commit makes them apply again and also fixes some other problems
related to this change.
Fixes commit 91a52f22a1 ("treewide: backport support for nvmem on non platform devices")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 1af2e375a76c55d227b7d1b1f1ba1c9cf850946a Mon Sep 17 00:00:00 2001
|
||
From: Calvin Johnson <calvin.johnson@nxp.com>
|
||
Date: Thu, 4 Oct 2018 09:39:00 +0530
|
||
Subject: [PATCH] staging: fsl_ppfe/eth: resolve indentation warning
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Resolve the following indentation warning:
|
||
|
||
drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c:
|
||
In function ‘pfe_get_gemac_if_proprties’:
|
||
drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c:96:2:
|
||
warning: this ‘else’ clause does not guard...
|
||
[-Wmisleading-indentation]
|
||
else
|
||
^~~~
|
||
drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c:98:3:
|
||
note: ...this statement, but the latter is misleadingly indented as
|
||
if it were guarded by the ‘else’
|
||
pdata->ls1012a_eth_pdata[port].mdio_muxval = phy_id;
|
||
^~~~~
|
||
|
||
Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
|
||
---
|
||
drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c | 5 +++--
|
||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
||
--- a/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
||
+++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
||
@@ -83,11 +83,12 @@ static int pfe_get_gemac_if_proprties(st
|
||
}
|
||
|
||
addr = of_get_property(gem, "fsl,mdio-mux-val", &size);
|
||
- if (!addr)
|
||
+ if (!addr) {
|
||
pr_err("%s: Invalid mdio-mux-val....\n", __func__);
|
||
- else
|
||
+ } else {
|
||
phy_id = be32_to_cpup(addr);
|
||
pdata->ls1012a_eth_pdata[port].mdio_muxval = phy_id;
|
||
+ }
|
||
|
||
if (pdata->ls1012a_eth_pdata[port].phy_id < 32)
|
||
pfe->mdio_muxval[pdata->ls1012a_eth_pdata[port].phy_id] =
|