Thread (4 messages) 4 messages, 3 authors, 2016-03-29

Re: [PATCH] net: macb: Only call GPIO functions if there is a valid GPIO

From: Sergei Shtylyov <hidden>
Date: 2016-03-28 17:30:18
Also in: lkml

Hello.

On 03/28/2016 03:47 PM, Charles Keepax wrote:
quoted hunk ↗ jump to hunk
GPIOlib will print warning messages if we call GPIO functions without a
valid GPIO. Change the code to avoid doing so.

Signed-off-by: Charles Keepax <redacted>
---
  drivers/net/ethernet/cadence/macb.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 6619178..71bb42e 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2957,9 +2957,10 @@ static int macb_probe(struct platform_device *pdev)
  	phy_node =  of_get_next_available_child(np, NULL);
  	if (phy_node) {
  		int gpio = of_get_named_gpio(phy_node, "reset-gpios", 0);
-		if (gpio_is_valid(gpio))
+		if (gpio_is_valid(gpio)) {
  			bp->reset_gpio = gpio_to_desc(gpio);
-		gpiod_direction_output(bp->reset_gpio, 1);
+			gpiod_direction_output(bp->reset_gpio, 1);
+		}
    Oops, sorry for missing this while fixing this code.
quoted hunk ↗ jump to hunk
  	}
  	of_node_put(phy_node);
@@ -3029,7 +3030,8 @@ static int macb_remove(struct platform_device *pdev)
  		mdiobus_free(bp->mii_bus);

  		/* Shutdown the PHY if there is a GPIO reset */
-		gpiod_set_value(bp->reset_gpio, 0);
+		if (bp->reset_gpio)
+			gpiod_set_value(bp->reset_gpio, 0);
    Hm, this function was previously OK to call with NULL (it didn't curse)...
  		unregister_netdev(dev);
  		clk_disable_unprepare(bp->tx_clk);
MBR, Sergei
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help