net: ethernet: remove unnecessary pci_set_drvdata() part 3
Subsystems (12)
cover net: ethernet: remove unnecessary pci_set_drvdata() part 3
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/pasemi/pasemi_mac.c | 1 - drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 -- drivers/net/ethernet/qlogic/qla3xxx.c | 2 -- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 -- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 1 - drivers/net/ethernet/rdc/r6040.c | 2 -- drivers/net/ethernet/realtek/8139cp.c | 1 - drivers/net/ethernet/realtek/8139too.c | 1 - drivers/net/ethernet/realtek/r8169.c | 1 - drivers/net/ethernet/sis/sis190.c | 1 - drivers/net/ethernet/smsc/epic100.c | 1 - drivers/net/ethernet/smsc/smsc9420.c | 2 -- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 - drivers/net/ethernet/sun/cassini.c | 2 -- drivers/net/ethernet/sun/sunhme.c | 2 -- 15 files changed, 22 deletions(-)
PATCH 1/15 net: pasemi: 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/pasemi/pasemi_mac.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/pasemi/pasemi_mac.c +0 -1
@@ -1870,7 +1870,6 @@ static void pasemi_mac_remove(struct pci_dev *pdev)pasemi_dma_free_chan (&mac->tx->chan);pasemi_dma_free_chan (&mac->rx->chan); -pci_set_drvdata (pdev,NULL );free_netdev (netdev); }
Signature · 1 line
1.7.10.4
Re: [PATCH 01/15] net: pasemi: remove unnecessary pci_set_drvdata()
Quoted 5 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]>
PATCH 2/15 net: netxen: 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/qlogic/netxen/netxen_nic_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +0 -2
@@ -1630,7 +1630,6 @@ err_out_free_res:pci_release_regions (pdev); err_out_disable_pdev: -pci_set_drvdata (pdev,NULL );pci_disable_device (pdev);return err; }
@@ -1689,7 +1688,6 @@ static void netxen_nic_remove(struct pci_dev *pdev)pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (netdev); }
Signature · 1 line
1.7.10.4
PATCH 3/15 net: qlge: 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/qlogic/qlge/qlge_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/qlogic/qlge/qlge_main.c +0 -1
@@ -4577,7 +4577,6 @@ static void ql_release_all(struct pci_dev *pdev)iounmap (qdev->doorbell_area);vfree (qdev->mpi_coredump);pci_release_regions (pdev); -pci_set_drvdata (pdev,NULL ); } static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
Signature · 1 line
1.7.10.4
PATCH 4/15 net: qlcnic: 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/qlogic/qlcnic/qlcnic_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0 -2
@@ -2406,7 +2406,6 @@ err_out_free_res:pci_release_regions (pdev); err_out_disable_pdev: -pci_set_drvdata (pdev,NULL );pci_disable_device (pdev);return err;
@@ -2482,7 +2481,6 @@ static void qlcnic_remove(struct pci_dev *pdev)pci_disable_pcie_error_reporting (pdev);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );if (adapter->qlcnic_wq) {destroy_workqueue (adapter->qlcnic_wq);
Signature · 1 line
1.7.10.4
PATCH 5/15 net: qla3xxx: 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/qlogic/qla3xxx.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/qlogic/qla3xxx.c +0 -2
@@ -3916,7 +3916,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; }
@@ -3939,7 +3938,6 @@ static void ql3xxx_remove(struct pci_dev *pdev)iounmap (qdev->mem_map_registers);pci_release_regions (pdev); -pci_set_drvdata (pdev,NULL );free_netdev (ndev); }
Signature · 1 line
1.7.10.4
PATCH 6/15 net: r6040: 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/rdc/r6040.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/rdc/r6040.c +0 -2
@@ -1231,7 +1231,6 @@ err_out_mdio:mdiobus_free (lp->mii_bus); err_out_unmap:netif_napi_del (&lp->napi); -pci_set_drvdata (pdev,NULL );pci_iounmap (pdev, ioaddr); err_out_free_res:pci_release_regions (pdev);
@@ -1257,7 +1256,6 @@ static void r6040_remove_one(struct pci_dev *pdev)pci_release_regions (pdev);free_netdev (dev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); }
Signature · 1 line
1.7.10.4
PATCH 7/15 net: 8139cp: 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/realtek/8139cp.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/realtek/8139cp.c +0 -1
@@ -2052,7 +2052,6 @@ static void cp_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 8/15 net: 8139too: 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/realtek/8139too.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/realtek/8139too.c +0 -1
@@ -727,7 +727,6 @@ static void __rtl8139_cleanup_dev (struct net_device *dev)pci_release_regions (pdev);free_netdev (dev); -pci_set_drvdata (pdev,NULL ); }
Signature · 1 line
1.7.10.4
PATCH 9/15 net: r8169: 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/realtek/r8169.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/realtek/r8169.c +0 -1
@@ -6811,7 +6811,6 @@ static void rtl_remove_one(struct pci_dev *pdev)rtl_disable_msi (pdev, tp);rtl8169_release_board (pdev, dev, tp->mmio_addr); -pci_set_drvdata (pdev,NULL ); }static const struct net_device_ops rtl_netdev_ops = {
Signature · 1 line
1.7.10.4
PATCH 10/15 net: sis190: 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/sis/sis190.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/sis/sis190.c +0 -1
@@ -1921,7 +1921,6 @@ static void sis190_remove_one(struct pci_dev *pdev)cancel_work_sync (&tp->phy_task);unregister_netdev (dev);sis190_release_board (pdev); -pci_set_drvdata (pdev,NULL ); }static struct pci_driver sis190_pci_driver = {
Signature · 1 line
1.7.10.4
PATCH 11/15 net: epic100: 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/smsc/epic100.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/smsc/epic100.c +0 -1
@@ -1535,7 +1535,6 @@ static void epic_remove_one(struct pci_dev *pdev)pci_release_regions (pdev);free_netdev (dev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );/* pci_power_off(pdev, -1); */ }
Signature · 1 line
1.7.10.4
PATCH 12/15 net: smsc9420: 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/smsc/smsc9420.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/smsc/smsc9420.c +0 -2
@@ -1707,8 +1707,6 @@ static void smsc9420_remove(struct pci_dev *pdev)if (!dev)return ; -pci_set_drvdata (pdev,NULL ); - pd =netdev_priv (dev);unregister_netdev (dev);
Signature · 1 line
1.7.10.4
PATCH 13/15 net: stmmac: 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/stmicro/stmmac/stmmac_pci.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +0 -1
@@ -138,7 +138,6 @@ static void stmmac_pci_remove(struct pci_dev *pdev)stmmac_dvr_remove (ndev); -pci_set_drvdata (pdev,NULL );pci_iounmap (pdev, priv->ioaddr);pci_release_regions (pdev);pci_disable_device (pdev);
Signature · 1 line
1.7.10.4
PATCH 14/15 net: sunhme: 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/sun/sunhme.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/sun/sunhme.c +0 -2
@@ -3170,8 +3170,6 @@ static void happy_meal_pci_remove(struct pci_dev *pdev)pci_release_regions (hp->happy_dev);free_netdev (net_dev); - -pci_set_drvdata (pdev,NULL ); }static DEFINE_PCI_DEVICE_TABLE (happymeal_pci_ids) = {
Signature · 1 line
1.7.10.4
PATCH 15/15 net: cassini: 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/sun/cassini.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/sun/cassini.c +0 -2
@@ -5168,7 +5168,6 @@ err_out_free_netdev: err_out_disable_pdev:pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL );return -ENODEV ; }
@@ -5206,7 +5205,6 @@ static void cas_remove_one(struct pci_dev *pdev)free_netdev (dev);pci_release_regions (pdev);pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); }#ifdef CONFIG_PM
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Jingoo Han <[email protected]>
Date: Tue, 22 Oct 2013 13:13:44 +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.