Re: [PATCH net-next 2/2] drivers: net: Remove device_node checks with of_mdiobus_register()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 05/15/2018 04:59 PM, Florian Fainelli wrote:
A number of drivers have the following pattern:

if (np)
	of_mdiobus_register()
else
	mdiobus_register()

which the implementation of of_mdiobus_register() now takes care of.
Remove that pattern in drivers that strictly adhere to it.

Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
---
  drivers/net/dsa/bcm_sf2.c                         |  8 ++------
  drivers/net/dsa/mv88e6xxx/chip.c                  |  5 +----
  drivers/net/ethernet/cadence/macb_main.c          | 12 +++---------
  drivers/net/ethernet/freescale/fec_main.c         |  8 ++------
  drivers/net/ethernet/marvell/mvmdio.c             |  5 +----
  drivers/net/ethernet/renesas/sh_eth.c             | 11 +++--------
  drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c |  5 +----
  drivers/net/ethernet/ti/davinci_mdio.c            |  6 ++----
  drivers/net/phy/mdio-gpio.c                       |  6 +-----
  drivers/net/phy/mdio-mscc-miim.c                  |  6 +-----
  drivers/net/usb/lan78xx.c                         |  7 ++-----
  11 files changed, 19 insertions(+), 60 deletions(-)


...

  		goto bus_register_fail;
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index 98a1c97fb95e..e720244e7f71 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -431,10 +431,8 @@ static int davinci_mdio_probe(struct platform_device *pdev)
  	 */
  	if (dev->of_node && of_get_child_count(dev->of_node)) {

It causes build error due to "{" above.

  		data->skip_scan = true;
-		ret = of_mdiobus_register(data->bus, dev->of_node);
-	} else {
-		ret = mdiobus_register(data->bus);
-	}
+
+	ret = of_mdiobus_register(data->bus, dev->of_node);
  	if (ret)
  		goto bail_out;
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index b501221819e1..4e4c8daf44c3 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -179,11 +179,7 @@ static int mdio_gpio_probe(struct platform_device *pdev)

[...]

--
regards,
-grygorii
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux