All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2
@ 2013-10-21  2:08 Jingoo Han
  2013-10-21  2:09 ` [PATCH 01/15] net: tulip: remove unnecessary pci_set_drvdata() Jingoo Han
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:08 UTC (permalink / raw)
  To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'

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

---
 drivers/net/ethernet/dec/tulip/de2104x.c         |    1 -
 drivers/net/ethernet/dec/tulip/dmfe.c            |    3 ---
 drivers/net/ethernet/dec/tulip/tulip_core.c      |    1 -
 drivers/net/ethernet/dec/tulip/uli526x.c         |    2 --
 drivers/net/ethernet/dec/tulip/winbond-840.c     |    3 ---
 drivers/net/ethernet/dec/tulip/xircom_cb.c       |    2 --
 drivers/net/ethernet/dlink/dl2k.c                |    1 -
 drivers/net/ethernet/dlink/sundance.c            |    2 --
 drivers/net/ethernet/emulex/benet/be_main.c      |    2 --
 drivers/net/ethernet/fealnx.c                    |    1 -
 drivers/net/ethernet/icplus/ipg.c                |    1 -
 drivers/net/ethernet/intel/e100.c                |    2 --
 drivers/net/ethernet/jme.c                       |    2 --
 drivers/net/ethernet/marvell/skge.c              |    2 --
 drivers/net/ethernet/marvell/sky2.c              |    3 ---
 drivers/net/ethernet/micrel/ksz884x.c            |    2 --
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c |    1 -
 drivers/net/ethernet/natsemi/natsemi.c           |    2 --
 drivers/net/ethernet/neterion/s2io.c             |    2 --
 drivers/net/ethernet/neterion/vxge/vxge-main.c   |    2 --
 drivers/net/ethernet/packetengines/hamachi.c     |    1 -
 drivers/net/ethernet/packetengines/yellowfin.c   |    2 --
 22 files changed, 40 deletions(-)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [PATCH 01/15] net: tulip: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
@ 2013-10-21  2:09 ` Jingoo Han
  2013-10-21  2:10 ` [PATCH 02/15] net: sundance: " Jingoo Han
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:09 UTC (permalink / raw)
  To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/dec/tulip/de2104x.c     |    1 -
 drivers/net/ethernet/dec/tulip/dmfe.c        |    3 ---
 drivers/net/ethernet/dec/tulip/tulip_core.c  |    1 -
 drivers/net/ethernet/dec/tulip/uli526x.c     |    2 --
 drivers/net/ethernet/dec/tulip/winbond-840.c |    3 ---
 drivers/net/ethernet/dec/tulip/xircom_cb.c   |    2 --
 6 files changed, 12 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index eaab73c..38148b0 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -2110,7 +2110,6 @@ static void de_remove_one(struct pci_dev *pdev)
 	iounmap(de->regs);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(dev);
 }
 
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 8313930..5ad9e3e 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -523,7 +523,6 @@ err_out_res:
 err_out_disable:
 	pci_disable_device(pdev);
 err_out_free:
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(dev);
 
 	return err;
@@ -548,8 +547,6 @@ static void dmfe_remove_one(struct pci_dev *pdev)
 					db->buf_pool_ptr, db->buf_pool_dma_ptr);
 		pci_release_regions(pdev);
 		free_netdev(dev);	/* free board information */
-
-		pci_set_drvdata(pdev, NULL);
 	}
 
 	DMFE_DBUG(0, "dmfe_remove_one() exit", 0);
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 4e8cfa2..add05f1 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1939,7 +1939,6 @@ static void tulip_remove_one(struct pci_dev *pdev)
 	pci_iounmap(pdev, tp->base_addr);
 	free_netdev (dev);
 	pci_release_regions (pdev);
-	pci_set_drvdata (pdev, NULL);
 
 	/* pci_power_off (pdev, -1); */
 }
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index 93845af..a5397b1 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -429,7 +429,6 @@ err_out_release:
 err_out_disable:
 	pci_disable_device(pdev);
 err_out_free:
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(dev);
 
 	return err;
@@ -450,7 +449,6 @@ static void uli526x_remove_one(struct pci_dev *pdev)
 				db->buf_pool_ptr, db->buf_pool_dma_ptr);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(dev);
 }
 
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index c7b04ec..62fe512 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -468,7 +468,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
 	return 0;
 
 err_out_cleardev:
-	pci_set_drvdata(pdev, NULL);
 	pci_iounmap(pdev, ioaddr);
 err_out_free_res:
 	pci_release_regions(pdev);
@@ -1542,8 +1541,6 @@ static void w840_remove1(struct pci_dev *pdev)
 		pci_iounmap(pdev, np->base_addr);
 		free_netdev(dev);
 	}
-
-	pci_set_drvdata(pdev, NULL);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index 9b84cb0..ab7ebac 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -289,7 +289,6 @@ out:
 err_unmap:
 	pci_iounmap(pdev, private->ioaddr);
 reg_fail:
-	pci_set_drvdata(pdev, NULL);
 	dma_free_coherent(d, 8192, private->tx_buffer, private->tx_dma_handle);
 tx_buf_fail:
 	dma_free_coherent(d, 8192, private->rx_buffer, private->rx_dma_handle);
@@ -317,7 +316,6 @@ static void xircom_remove(struct pci_dev *pdev)
 
 	unregister_netdev(dev);
 	pci_iounmap(pdev, card->ioaddr);
-	pci_set_drvdata(pdev, NULL);
 	dma_free_coherent(d, 8192, card->tx_buffer, card->tx_dma_handle);
 	dma_free_coherent(d, 8192, card->rx_buffer, card->rx_dma_handle);
 	free_netdev(dev);
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 02/15] net: sundance: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
  2013-10-21  2:09 ` [PATCH 01/15] net: tulip: remove unnecessary pci_set_drvdata() Jingoo Han
@ 2013-10-21  2:10 ` Jingoo Han
  2013-10-21  2:11 ` [PATCH 03/15] net: dl2k: " Jingoo Han
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:10 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Denis Kirjanov'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/dlink/sundance.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index bf3bf6f..113cd79 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -703,7 +703,6 @@ err_out_unmap_tx:
 	dma_free_coherent(&pdev->dev, TX_TOTAL_SIZE,
 		np->tx_ring, np->tx_ring_dma);
 err_out_cleardev:
-	pci_set_drvdata(pdev, NULL);
 	pci_iounmap(pdev, ioaddr);
 err_out_res:
 	pci_release_regions(pdev);
@@ -1941,7 +1940,6 @@ static void sundance_remove1(struct pci_dev *pdev)
 	    pci_iounmap(pdev, np->base);
 	    pci_release_regions(pdev);
 	    free_netdev(dev);
-	    pci_set_drvdata(pdev, NULL);
 	}
 }
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 03/15] net: dl2k: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
  2013-10-21  2:09 ` [PATCH 01/15] net: tulip: remove unnecessary pci_set_drvdata() Jingoo Han
  2013-10-21  2:10 ` [PATCH 02/15] net: sundance: " Jingoo Han
@ 2013-10-21  2:11 ` Jingoo Han
  2013-10-21  2:11 ` [PATCH 04/15] net: be2net: " Jingoo Han
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:11 UTC (permalink / raw)
  To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/dlink/dl2k.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
index afa8e3a..4fb756d 100644
--- a/drivers/net/ethernet/dlink/dl2k.c
+++ b/drivers/net/ethernet/dlink/dl2k.c
@@ -1746,7 +1746,6 @@ rio_remove1 (struct pci_dev *pdev)
 		pci_release_regions (pdev);
 		pci_disable_device (pdev);
 	}
-	pci_set_drvdata (pdev, NULL);
 }
 
 static struct pci_driver rio_driver = {
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 04/15] net: be2net: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (2 preceding siblings ...)
  2013-10-21  2:11 ` [PATCH 03/15] net: dl2k: " Jingoo Han
@ 2013-10-21  2:11 ` Jingoo Han
  2013-10-21  2:12 ` [PATCH 05/15] net: fealnx: " Jingoo Han
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:11 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Sathya Perla',
	'Subbu Seetharaman', 'Ajit Khaparde'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/emulex/benet/be_main.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index f0866e2..393e3dc 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4204,7 +4204,6 @@ static void be_remove(struct pci_dev *pdev)
 
 	pci_disable_pcie_error_reporting(pdev);
 
-	pci_set_drvdata(pdev, NULL);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
 
@@ -4534,7 +4533,6 @@ ctrl_clean:
 	be_ctrl_cleanup(adapter);
 free_netdev:
 	free_netdev(netdev);
-	pci_set_drvdata(pdev, NULL);
 rel_reg:
 	pci_release_regions(pdev);
 disable_dev:
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 05/15] net: fealnx: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (3 preceding siblings ...)
  2013-10-21  2:11 ` [PATCH 04/15] net: be2net: " Jingoo Han
@ 2013-10-21  2:12 ` Jingoo Han
  2013-10-21  2:12 ` [PATCH 06/15] net: icplus: " Jingoo Han
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:12 UTC (permalink / raw)
  To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/fealnx.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index c706b7a..4b22a95 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -699,7 +699,6 @@ static void fealnx_remove_one(struct pci_dev *pdev)
 		pci_iounmap(pdev, np->mem);
 		free_netdev(dev);
 		pci_release_regions(pdev);
-		pci_set_drvdata(pdev, NULL);
 	} else
 		printk(KERN_ERR "fealnx: remove for unknown device\n");
 }
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 06/15] net: icplus: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (4 preceding siblings ...)
  2013-10-21  2:12 ` [PATCH 05/15] net: fealnx: " Jingoo Han
@ 2013-10-21  2:12 ` Jingoo Han
  2013-10-21  2:13 ` [PATCH 07/15] net: e100: " Jingoo Han
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:12 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Francois Romieu',
	'Sorbica Shieh'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/icplus/ipg.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/icplus/ipg.c b/drivers/net/ethernet/icplus/ipg.c
index bdf5023..25045ae 100644
--- a/drivers/net/ethernet/icplus/ipg.c
+++ b/drivers/net/ethernet/icplus/ipg.c
@@ -2183,7 +2183,6 @@ static void ipg_remove(struct pci_dev *pdev)
 
 	free_netdev(dev);
 	pci_disable_device(pdev);
-	pci_set_drvdata(pdev, NULL);
 }
 
 static const struct net_device_ops ipg_netdev_ops = {
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 07/15] net: e100: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (5 preceding siblings ...)
  2013-10-21  2:12 ` [PATCH 06/15] net: icplus: " Jingoo Han
@ 2013-10-21  2:13 ` Jingoo Han
  2013-10-21  2:13 ` [PATCH 08/15] net: jme: " Jingoo Han
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:13 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Jeff Kirsher',
	'Aaron Brown'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/intel/e100.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index ada6e21..cbaba44 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2985,7 +2985,6 @@ err_out_free_res:
 err_out_disable_pdev:
 	pci_disable_device(pdev);
 err_out_free_dev:
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(netdev);
 	return err;
 }
@@ -3003,7 +3002,6 @@ static void e100_remove(struct pci_dev *pdev)
 		free_netdev(netdev);
 		pci_release_regions(pdev);
 		pci_disable_device(pdev);
-		pci_set_drvdata(pdev, NULL);
 	}
 }
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 08/15] net: jme: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (6 preceding siblings ...)
  2013-10-21  2:13 ` [PATCH 07/15] net: e100: " Jingoo Han
@ 2013-10-21  2:13 ` Jingoo Han
  2013-10-21  2:13 ` [PATCH 09/15] net: skge: " Jingoo Han
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:13 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Guo-Fu Tseng'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/jme.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index b56d2a2..f5685c0 100644
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -3192,7 +3192,6 @@ jme_init_one(struct pci_dev *pdev,
 err_out_unmap:
 	iounmap(jme->regs);
 err_out_free_netdev:
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(netdev);
 err_out_release_regions:
 	pci_release_regions(pdev);
@@ -3210,7 +3209,6 @@ jme_remove_one(struct pci_dev *pdev)
 
 	unregister_netdev(netdev);
 	iounmap(jme->regs);
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(netdev);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 09/15] net: skge: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (7 preceding siblings ...)
  2013-10-21  2:13 ` [PATCH 08/15] net: jme: " Jingoo Han
@ 2013-10-21  2:13 ` Jingoo Han
  2013-10-21  2:14 ` [PATCH 10/15] net: sky2: " Jingoo Han
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:13 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Mirko Lindner',
	'Stephen Hemminger'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/marvell/skge.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index ecc7f7b..5978461 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -4046,7 +4046,6 @@ err_out_free_regions:
 	pci_release_regions(pdev);
 err_out_disable_pdev:
 	pci_disable_device(pdev);
-	pci_set_drvdata(pdev, NULL);
 err_out:
 	return err;
 }
@@ -4090,7 +4089,6 @@ static void skge_remove(struct pci_dev *pdev)
 
 	iounmap(hw->regs);
 	kfree(hw);
-	pci_set_drvdata(pdev, NULL);
 }
 
 #ifdef CONFIG_PM_SLEEP
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 10/15] net: sky2: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (8 preceding siblings ...)
  2013-10-21  2:13 ` [PATCH 09/15] net: skge: " Jingoo Han
@ 2013-10-21  2:14 ` Jingoo Han
  2013-10-21  2:14 ` [PATCH 11/15] net: ksz884x: " Jingoo Han
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:14 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Mirko Lindner',
	'Stephen Hemminger'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/marvell/sky2.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index e09a8c6..a7df981 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -5081,7 +5081,6 @@ err_out_free_regions:
 err_out_disable:
 	pci_disable_device(pdev);
 err_out:
-	pci_set_drvdata(pdev, NULL);
 	return err;
 }
 
@@ -5124,8 +5123,6 @@ static void sky2_remove(struct pci_dev *pdev)
 
 	iounmap(hw->regs);
 	kfree(hw);
-
-	pci_set_drvdata(pdev, NULL);
 }
 
 static int sky2_suspend(struct device *dev)
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 11/15] net: ksz884x: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (9 preceding siblings ...)
  2013-10-21  2:14 ` [PATCH 10/15] net: sky2: " Jingoo Han
@ 2013-10-21  2:14 ` Jingoo Han
  2013-10-21  2:15 ` [PATCH 12/15] net: myri10ge: " Jingoo Han
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:14 UTC (permalink / raw)
  To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/micrel/ksz884x.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 8ebc352..6462dc5 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -7150,8 +7150,6 @@ static void pcidev_exit(struct pci_dev *pdev)
 	struct platform_info *info = pci_get_drvdata(pdev);
 	struct dev_info *hw_priv = &info->dev_info;
 
-	pci_set_drvdata(pdev, NULL);
-
 	release_mem_region(pci_resource_start(pdev, 0),
 		pci_resource_len(pdev, 0));
 	for (i = 0; i < hw_priv->hw.dev_count; i++) {
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 12/15] net: myri10ge: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (10 preceding siblings ...)
  2013-10-21  2:14 ` [PATCH 11/15] net: ksz884x: " Jingoo Han
@ 2013-10-21  2:15 ` Jingoo Han
  2013-10-21  2:15 ` [PATCH 13/15] net: natsemi: " Jingoo Han
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:15 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Hyong-Youb Kim'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 1975550..68026f7 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -4208,7 +4208,6 @@ static void myri10ge_remove(struct pci_dev *pdev)
 	set_fw_name(mgp, NULL, false);
 	free_netdev(netdev);
 	pci_disable_device(pdev);
-	pci_set_drvdata(pdev, NULL);
 }
 
 #define PCI_DEVICE_ID_MYRICOM_MYRI10GE_Z8E 	0x0008
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 13/15] net: natsemi: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (11 preceding siblings ...)
  2013-10-21  2:15 ` [PATCH 12/15] net: myri10ge: " Jingoo Han
@ 2013-10-21  2:15 ` Jingoo Han
  2013-10-21  2:16 ` [PATCH 14/15] net: neterion: " Jingoo Han
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:15 UTC (permalink / raw)
  To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/natsemi/natsemi.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index 7a5e295..64ec2a4 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -970,7 +970,6 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
 
  err_ioremap:
 	pci_release_regions(pdev);
-	pci_set_drvdata(pdev, NULL);
 
  err_pci_request_regions:
 	free_netdev(dev);
@@ -3220,7 +3219,6 @@ static void natsemi_remove1(struct pci_dev *pdev)
 	pci_release_regions (pdev);
 	iounmap(ioaddr);
 	free_netdev (dev);
-	pci_set_drvdata(pdev, NULL);
 }
 
 #ifdef CONFIG_PM
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 14/15] net: neterion: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (12 preceding siblings ...)
  2013-10-21  2:15 ` [PATCH 13/15] net: natsemi: " Jingoo Han
@ 2013-10-21  2:16 ` Jingoo Han
  2013-10-21  2:17 ` [PATCH 15/15] net: packetengines: " Jingoo Han
  2013-10-21 21:21 ` [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 David Miller
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:16 UTC (permalink / raw)
  To: 'David S. Miller'
  Cc: netdev, 'Jingoo Han', 'Jon Mason'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/net/ethernet/neterion/s2io.c           |    2 --
 drivers/net/ethernet/neterion/vxge/vxge-main.c |    2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 51b0094..9eeddbd 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -8185,7 +8185,6 @@ mem_alloc_failed:
 	free_shared_mem(sp);
 	pci_disable_device(pdev);
 	pci_release_regions(pdev);
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(dev);
 
 	return ret;
@@ -8221,7 +8220,6 @@ static void s2io_rem_nic(struct pci_dev *pdev)
 	iounmap(sp->bar0);
 	iounmap(sp->bar1);
 	pci_release_regions(pdev);
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(dev);
 	pci_disable_device(pdev);
 }
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 5a20eaf..8614eeb 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -4739,7 +4739,6 @@ _exit6:
 _exit5:
 	vxge_device_unregister(hldev);
 _exit4:
-	pci_set_drvdata(pdev, NULL);
 	vxge_hw_device_terminate(hldev);
 	pci_disable_sriov(pdev);
 _exit3:
@@ -4782,7 +4781,6 @@ static void vxge_remove(struct pci_dev *pdev)
 		vxge_free_mac_add_list(&vdev->vpaths[i]);
 
 	vxge_device_unregister(hldev);
-	pci_set_drvdata(pdev, NULL);
 	/* Do not call pci_disable_sriov here, as it will break child devices */
 	vxge_hw_device_terminate(hldev);
 	iounmap(vdev->bar0);
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [PATCH 15/15] net: packetengines: remove unnecessary pci_set_drvdata()
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (13 preceding siblings ...)
  2013-10-21  2:16 ` [PATCH 14/15] net: neterion: " Jingoo Han
@ 2013-10-21  2:17 ` Jingoo Han
  2013-10-21 21:21 ` [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 David Miller
  15 siblings, 0 replies; 17+ messages in thread
From: Jingoo Han @ 2013-10-21  2:17 UTC (permalink / raw)
  To: 'David S. Miller'; +Cc: netdev, 'Jingoo Han'

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/net/ethernet/packetengines/hamachi.c   |    1 -
 drivers/net/ethernet/packetengines/yellowfin.c |    2 --
 2 files changed, 3 deletions(-)

diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index cac33e5..b6bdeb3 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -1910,7 +1910,6 @@ static void hamachi_remove_one(struct pci_dev *pdev)
 		iounmap(hmp->base);
 		free_netdev(dev);
 		pci_release_regions(pdev);
-		pci_set_drvdata(pdev, NULL);
 	}
 }
 
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index d28593b..07a890e 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -513,7 +513,6 @@ err_out_unmap_rx:
 err_out_unmap_tx:
         pci_free_consistent(pdev, TX_TOTAL_SIZE, np->tx_ring, np->tx_ring_dma);
 err_out_cleardev:
-	pci_set_drvdata(pdev, NULL);
 	pci_iounmap(pdev, ioaddr);
 err_out_free_res:
 	pci_release_regions(pdev);
@@ -1392,7 +1391,6 @@ static void yellowfin_remove_one(struct pci_dev *pdev)
 	pci_release_regions (pdev);
 
 	free_netdev (dev);
-	pci_set_drvdata(pdev, NULL);
 }
 
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* Re: [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2
  2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
                   ` (14 preceding siblings ...)
  2013-10-21  2:17 ` [PATCH 15/15] net: packetengines: " Jingoo Han
@ 2013-10-21 21:21 ` David Miller
  15 siblings, 0 replies; 17+ messages in thread
From: David Miller @ 2013-10-21 21:21 UTC (permalink / raw)
  To: jg1.han; +Cc: netdev

From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 21 Oct 2013 11:08:21 +0900

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

Series applied, thanks.

^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2013-10-21 21:21 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-21  2:08 [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 Jingoo Han
2013-10-21  2:09 ` [PATCH 01/15] net: tulip: remove unnecessary pci_set_drvdata() Jingoo Han
2013-10-21  2:10 ` [PATCH 02/15] net: sundance: " Jingoo Han
2013-10-21  2:11 ` [PATCH 03/15] net: dl2k: " Jingoo Han
2013-10-21  2:11 ` [PATCH 04/15] net: be2net: " Jingoo Han
2013-10-21  2:12 ` [PATCH 05/15] net: fealnx: " Jingoo Han
2013-10-21  2:12 ` [PATCH 06/15] net: icplus: " Jingoo Han
2013-10-21  2:13 ` [PATCH 07/15] net: e100: " Jingoo Han
2013-10-21  2:13 ` [PATCH 08/15] net: jme: " Jingoo Han
2013-10-21  2:13 ` [PATCH 09/15] net: skge: " Jingoo Han
2013-10-21  2:14 ` [PATCH 10/15] net: sky2: " Jingoo Han
2013-10-21  2:14 ` [PATCH 11/15] net: ksz884x: " Jingoo Han
2013-10-21  2:15 ` [PATCH 12/15] net: myri10ge: " Jingoo Han
2013-10-21  2:15 ` [PATCH 13/15] net: natsemi: " Jingoo Han
2013-10-21  2:16 ` [PATCH 14/15] net: neterion: " Jingoo Han
2013-10-21  2:17 ` [PATCH 15/15] net: packetengines: " Jingoo Han
2013-10-21 21:21 ` [PATCH 00/15] net: ethernet: remove unnecessary pci_set_drvdata() part 2 David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.