Skip to contentSkip to conversation

net: ethernet: cadence: remove unnecessary platform_set_drvdata()

PATCH Applied Jingoo Han 2 participants 2 messages May 7, 2013

Subsystems (4)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 9/36 net: ethernet: cadence: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.

---
 drivers/net/ethernet/cadence/at91_ether.c |    1 -
 drivers/net/ethernet/cadence/macb.c       |    2 --
 2 files changed, 0 insertions(+), 3 deletions(-)
drivers/net/ethernet/cadence/at91_ether.c +0 -1
index cc9a185..3f19571 100644
@@ -435,7 +435,6 @@ static int at91ether_remove(struct platform_device *pdev)
 	unregister_netdev(dev);
 	clk_disable(lp->pclk);
 	free_netdev(dev);
-	platform_set_drvdata(pdev, NULL);
 
 	return 0;
 }
drivers/net/ethernet/cadence/macb.c +0 -2
index 6be513d..6a7bf7d 100644
@@ -1635,7 +1635,6 @@ err_out_put_pclk:
 err_out_free_dev:
 	free_netdev(dev);
 err_out:
-	platform_set_drvdata(pdev, NULL);
 	return err;
 }
 
@@ -1661,7 +1660,6 @@ static int __exit macb_remove(struct platform_device *pdev)
 		clk_disable_unprepare(bp->pclk);
 		clk_put(bp->pclk);
 		free_netdev(dev);
-		platform_set_drvdata(pdev, NULL);
 	}
 
 	return 0;
Signature · 1 line
1.7.2.5
Acked-by on v1 9/36
#1 lore raw

On 07/05/2013 06:23, Jingoo Han :

Quoted 6 lines

The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.

Quoted 38 lines
---
  drivers/net/ethernet/cadence/at91_ether.c |    1 -
  drivers/net/ethernet/cadence/macb.c       |    2 --
  2 files changed, 0 insertions(+), 3 deletions(-)
drivers/net/ethernet/cadence/at91_ether.c +0 -1
index cc9a185..3f19571 100644
@@ -435,7 +435,6 @@ static int at91ether_remove(struct platform_device *pdev)
  	unregister_netdev(dev);
  	clk_disable(lp->pclk);
  	free_netdev(dev);
-	platform_set_drvdata(pdev, NULL);
 
  	return 0;
  }
drivers/net/ethernet/cadence/macb.c +0 -2
index 6be513d..6a7bf7d 100644
@@ -1635,7 +1635,6 @@ err_out_put_pclk:
  err_out_free_dev:
  	free_netdev(dev);
  err_out:
-	platform_set_drvdata(pdev, NULL);
  	return err;
  }
 
@@ -1661,7 +1660,6 @@ static int __exit macb_remove(struct platform_device *pdev)
  		clk_disable_unprepare(bp->pclk);
  		clk_put(bp->pclk);
  		free_netdev(dev);
-		platform_set_drvdata(pdev, NULL);
  	}
 
  	return 0;
Signature · 1 line
Nicolas Ferre