net: ethernet: remove unnecessary pci_set_drvdata() part 1
Subsystems (15)
cover net: ethernet: remove unnecessary pci_set_drvdata() part 1
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/3com/typhoon.c | 1 - drivers/net/ethernet/8390/ne2k-pci.c | 3 --- drivers/net/ethernet/adaptec/starfire.c | 2 -- drivers/net/ethernet/amd/amd8111e.c | 2 -- drivers/net/ethernet/amd/pcnet32.c | 1 - drivers/net/ethernet/atheros/alx/main.c | 1 - drivers/net/ethernet/broadcom/bnx2.c | 3 --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 --- drivers/net/ethernet/broadcom/tg3.c | 2 -- drivers/net/ethernet/brocade/bna/bnad.c | 1 - drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 -- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 -- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 -- drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 3 --- drivers/net/ethernet/cisco/enic/enic_main.c | 2 -- 15 files changed, 30 deletions(-)
PATCH 1/15 net: typhoon: remove unnecessary pci_set_drvdata()
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/3com/typhoon.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/3com/typhoon.c +0 -1
@@ -2525,7 +2525,6 @@ typhoon_remove_one(struct pci_dev *pdev)pci_release_regions (pdev);pci_clear_mwi (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (dev); }
Signature · 1 line
1.7.10.4
PATCH 2/15 net: 8390: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/8390/ne2k-pci.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/8390/ne2k-pci.c +0 -3
@@ -389,9 +389,7 @@ err_out_free_netdev:free_netdev (dev); err_out_free_res:release_region (ioaddr,NE_IO_EXTENT ); -pci_set_drvdata (pdev,NULL );return -ENODEV ; - }/*
@@ -655,7 +653,6 @@ static void ne2k_pci_remove_one(struct pci_dev *pdev)release_region (dev->base_addr,NE_IO_EXTENT );free_netdev (dev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); }#ifdef CONFIG_PM
Signature · 1 line
1.7.10.4
PATCH 3/15 net: starfire: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/adaptec/starfire.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/adaptec/starfire.c +0 -2
@@ -835,7 +835,6 @@ static int starfire_init_one(struct pci_dev *pdev,return 0 ; err_out_cleardev: -pci_set_drvdata (pdev,NULL );iounmap (base); err_out_free_res:pci_release_regions (pdev);
@@ -2012,7 +2011,6 @@ static void starfire_remove_one(struct pci_dev *pdev)iounmap (np->base);pci_release_regions (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (dev);/* Will also free np!! */ }
Signature · 1 line
1.7.10.4
PATCH 4/15 net: pcnet32: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/amd/pcnet32.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/amd/pcnet32.c +0 -1
@@ -2818,7 +2818,6 @@ static void pcnet32_remove_one(struct pci_dev *pdev) lp->init_block, lp->init_dma_addr);free_netdev (dev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); } }
Signature · 1 line
1.7.10.4
PATCH 5/15 net: amd8111e: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/amd/amd8111e.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/amd/amd8111e.c +0 -2
@@ -1711,7 +1711,6 @@ static void amd8111e_remove_one(struct pci_dev *pdev)free_netdev (dev);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); } }static void amd8111e_config_ipg (struct net_device * dev)
@@ -1967,7 +1966,6 @@ err_free_reg: err_disable_pdev:pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );return err; }
Signature · 1 line
1.7.10.4
PATCH 6/15 net: alx: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/atheros/alx/main.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/atheros/alx/main.c +0 -1
@@ -1367,7 +1367,6 @@ static void alx_remove(struct pci_dev *pdev)pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (alx->dev); }
Signature · 1 line
1.7.10.4
PATCH 7/15 net: bnx2: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/broadcom/bnx2.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/broadcom/bnx2.c +0 -3
@@ -8413,7 +8413,6 @@ err_out_release: err_out_disable:pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); err_out:return rc;
@@ -8546,7 +8545,6 @@ error:pci_iounmap (pdev, bp->regview);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); err_free:free_netdev (dev);return rc;
@@ -8578,7 +8576,6 @@ bnx2_remove_one(struct pci_dev *pdev)pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); } static int
Signature · 1 line
1.7.10.4
PATCH 8/15 net: bnx2x: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/broadcom/bnx2x/bnx2x_main.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +0 -3
@@ -12297,7 +12297,6 @@ err_out_release: err_out_disable:pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); err_out:return rc;
@@ -12840,7 +12839,6 @@ init_one_exit:pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );return rc; }
@@ -12923,7 +12921,6 @@ static void __bnx2x_remove(struct pci_dev *pdev,pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); }static void bnx2x_remove_one (struct pci_dev *pdev)
Signature · 1 line
1.7.10.4
PATCH 9/15 net: tg3: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/broadcom/tg3.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +0 -2
@@ -17701,7 +17701,6 @@ err_out_free_res: err_out_disable_pdev:if (pci_is_enabled (pdev))pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );return err; }
@@ -17733,7 +17732,6 @@ static void tg3_remove_one(struct pci_dev *pdev)free_netdev (dev);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); } }
Signature · 1 line
1.7.10.4
PATCH 10/15 net: bna: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/brocade/bna/bnad.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/brocade/bna/bnad.c +0 -1
@@ -3212,7 +3212,6 @@ bnad_init(struct bnad *bnad, bnad->bar0 =ioremap_nocache (bnad->mmio_start, bnad->mmio_len);if (!bnad->bar0) {dev_err (&pdev->dev,"ioremap for bar0 failed\n" ); -pci_set_drvdata (pdev,NULL );return -ENOMEM ; } pr_info("bar0 mapped to %p, len %llu\n", bnad->bar0,
Signature · 1 line
1.7.10.4
PATCH 11/15 net: cxgb4: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/chelsio/cxgb4/cxgb4_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0 -2
@@ -6075,7 +6075,6 @@ sriov:pci_disable_device (pdev); out_release_regions:pci_release_regions (pdev); -pci_set_drvdata (pdev,NULL );return err; }
@@ -6123,7 +6122,6 @@ static void remove_one(struct pci_dev *pdev)pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev);pci_release_regions (pdev); -pci_set_drvdata (pdev,NULL ); }else pci_release_regions (pdev); }
Signature · 1 line
1.7.10.4
PATCH 12/15 net: cxgb3: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/chelsio/cxgb3/cxgb3_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +0 -2
@@ -3374,7 +3374,6 @@ out_release_regions:pci_release_regions (pdev); out_disable_device:pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); out:return err; }
@@ -3415,7 +3414,6 @@ static void remove_one(struct pci_dev *pdev)kfree (adapter);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); } }
Signature · 1 line
1.7.10.4
PATCH 13/15 net: cxgb2: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/chelsio/cxgb/cxgb2.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb/cxgb2.c +0 -2
@@ -1168,7 +1168,6 @@ out_free_dev:pci_release_regions (pdev); out_disable_pdev:pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );return err; }
@@ -1347,7 +1346,6 @@ static void remove_one(struct pci_dev *pdev)pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );t1_sw_reset (pdev); }
Signature · 1 line
1.7.10.4
PATCH 14/15 net: cxgb4vf: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/chelsio/cxgb4vf/cxgb4vf_main.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +0 -3
@@ -2782,11 +2782,9 @@ err_unmap_bar: err_free_adapter:kfree (adapter); -pci_set_drvdata (pdev,NULL ); err_release_regions:pci_release_regions (pdev); -pci_set_drvdata (pdev,NULL );pci_clear_master (pdev); err_disable_device:
@@ -2851,7 +2849,6 @@ static void cxgb4vf_pci_remove(struct pci_dev *pdev) }iounmap (adapter->regs);kfree (adapter); -pci_set_drvdata (pdev,NULL ); }/*
Signature · 1 line
1.7.10.4
PATCH 15/15 net: enic: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe 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/cisco/enic/enic_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/cisco/enic/enic_main.c +0 -2
@@ -2309,7 +2309,6 @@ err_out_release_regions: err_out_disable_device:pci_disable_device (pdev); err_out_free_netdev: -pci_set_drvdata (pdev,NULL );free_netdev (netdev);return err;
@@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev)enic_iounmap (enic);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (netdev); } }
Signature · 1 line
1.7.10.4
RE: [PATCH 15/15] net: enic: remove unnecessary pci_set_drvdata()
Looks good.
-----Original Message-----
From: Jingoo Han [mailto:[email protected]]
Sent: Thursday, October 17, 2013 5:25 PM
To: 'David S. Miller'
Cc: [email protected]; 'Jingoo Han'; Christian Benvenuti (benve); Sujith Sankar (ssujith); 'Govindarajulu Varadarajan'; Neel Patel (neepatel); Nishank Trivedi (nistrive)
Subject: [PATCH 15/15] net: enic: remove unnecessary pci_set_drvdata()
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/cisco/enic/enic_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/cisco/enic/enic_main.c +0 -2
@@ -2309,7 +2309,6 @@ err_out_release_regions: err_out_disable_device:pci_disable_device (pdev); err_out_free_netdev: -pci_set_drvdata (pdev,NULL );free_netdev (netdev);return err;
@@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev)enic_iounmap (enic);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (netdev); } }
--
1.7.10.4
Re: [PATCH 15/15] net: enic: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThis looks good to me.
Regards,
-Sujith
Quoted 34 lines · Jingoo Han
The driver core clears the driver data to NULL after
device_releaseor on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.Signed-off-by Jingoo Han <[email protected]>---
drivers/net/ethernet/cisco/enic/enic_main.c| 2 --1 file changed, 2 deletions(-)drivers/net/ethernet/cisco/enic/enic_main.c +0
-0@@ -2309,7 +2309,6 @@ err_out_release_regions:
err_out_disable_device:pci_disable_device(pdev);
err_out_free_netdev:drivers/net/ethernet/cisco/enic/enic_main.c +0
-1-pci_set_drvdata (pdev,NULL );free_netdev(netdev); return err;drivers/net/ethernet/cisco/enic/enic_main.c +0
-1@@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev)enic_iounmap (enic);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (netdev); } }Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Jingoo Han <[email protected]>
Date: Fri, 18 Oct 2013 09:16:19 +0900
Quoted 5 lines
Since commit
0998d0631001288a5974afc0b2a5f568bcdecb4d(device-core: Ensure drvdata = NULL when no driver is bound), the driver core clears the driver data to NULL afterdevice_releaseor on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.
Series applied, thanks.