Merge branch 'pci_set_drvdata'

Jingoo Han says:

====================
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.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

15 files changed, 0 insertions, 30 deletions

diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 144942f6372b..465cc7108d8a 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -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);
 }
 
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 92201080e07a..fc14a85e4d5f 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -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
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index 8b04bfc20cfb..171d73c1d3c2 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -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!! */
 }
 
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 1b1429d5d5c2..d042511bdc13 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -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;
 
 }
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index bd4e6402003a..38492e0b704e 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -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);
         }
 }
 
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index fc95b235e210..5aa5e8146496 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -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);
 }
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 61118708fe98..d9980ad00b4b 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -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
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index e53ff1eb3a84..8fd343201576 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -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)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 498569e99a1c..819d87c281bf 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -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);
         }
 }
 
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index b78e69e0e52a..f276433d37ce 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -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,
diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
index d7048db9863d..1d021059f097 100644
--- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
@@ -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);
 }
 
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index b650951791dd..45d77334d7d9 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -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);
         }
 }
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 85d0cda5fbfa..8b929eeecd2d 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -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);
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 40c22e7de15c..43bb0123d456 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -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);
         }
 
         /*
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 7b756cf9474a..ff78dfaec508 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -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);
         }
 }