Revert "mdio_bus: Remove unneeded gpiod NULL check"

ffainelli · davem330 · commit a010a2f6540e · 2017-09-08T21:12:40.000-07:00
This reverts commit 95b80bf ("mdio_bus: Remove unneeded gpiod NULL check"), this commit assumed that GPIOLIB checks for NULL descriptors, so it's safe to drop them, but it is not when CONFIG_GPIOLIB is disabled in the kernel. If we do call gpiod_set_value_cansleep() on a GPIO descriptor we will issue warnings coming from the inline stubs declared in include/linux/gpio/consumer.h. Fixes: 95b80bf ("mdio_bus: Remove unneeded gpiod NULL check") Reported-by: Woojung Huh <Woojung.Huh@microchip.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
@@ -399,7 +399,8 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
 	}
 
 	/* Put PHYs in RESET to save power */
-	gpiod_set_value_cansleep(bus->reset_gpiod, 1);
+	if (bus->reset_gpiod)
+		gpiod_set_value_cansleep(bus->reset_gpiod, 1);
 
 	device_del(&bus->dev);
 	return err;
@@ -424,7 +425,8 @@ void mdiobus_unregister(struct mii_bus *bus)
 	}
 
 	/* Put PHYs in RESET to save power */
-	gpiod_set_value_cansleep(bus->reset_gpiod, 1);
+	if (bus->reset_gpiod)
+		gpiod_set_value_cansleep(bus->reset_gpiod, 1);
 
 	device_del(&bus->dev);
 }

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,8 @@ int __mdiobus_register(struct mii_bus bus, struct module owner)`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`/* Put PHYs in RESET to save power */`
`402`		`- gpiod_set_value_cansleep(bus->reset_gpiod, 1);`
	`402`	`+ if (bus->reset_gpiod)`
	`403`	`+ gpiod_set_value_cansleep(bus->reset_gpiod, 1);`
`403`	`404`
`404`	`405`	`device_del(&bus->dev);`
`405`	`406`	`return err;`
`@@ -424,7 +425,8 @@ void mdiobus_unregister(struct mii_bus *bus)`
`424`	`425`	`}`
`425`	`426`
`426`	`427`	`/* Put PHYs in RESET to save power */`
`427`		`- gpiod_set_value_cansleep(bus->reset_gpiod, 1);`
	`428`	`+ if (bus->reset_gpiod)`
	`429`	`+ gpiod_set_value_cansleep(bus->reset_gpiod, 1);`
`428`	`430`
`429`	`431`	`device_del(&bus->dev);`
`430`	`432`	`}`