Skip to contentSkip to conversation

net: sfc: remove unnecessary pci_set_drvdata()

PATCH In review Jingoo Han 2 participants 7 messages Nov 25, 2013 – Nov 28, 2013

Subsystems (6)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/5 net: sfc: 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/sfc/efx.c |    2 --
 1 file changed, 2 deletions(-)
drivers/net/ethernet/sfc/efx.c +0 -2
index 2e27837..ad6b811 100644
@@ -2641,7 +2641,6 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
 	netif_dbg(efx, drv, efx->net_dev, "shutdown successful\n");
 
 	efx_fini_struct(efx);
-	pci_set_drvdata(pci_dev, NULL);
 	free_netdev(efx->net_dev);
 
 	pci_disable_pcie_error_reporting(pci_dev);
@@ -2835,7 +2834,6 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
  fail2:
 	efx_fini_struct(efx);
  fail1:
-	pci_set_drvdata(pci_dev, NULL);
 	WARN_ON(rc > 0);
 	netif_dbg(efx, drv, efx->net_dev, "initialisation failed. rc=%d\n", rc);
 	free_netdev(net_dev);
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/5 net: sis900: 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/sis/sis900.c |    2 --
 1 file changed, 2 deletions(-)
drivers/net/ethernet/sis/sis900.c +0 -2
index 975dc2d..ff57a46 100644
@@ -576,7 +576,6 @@ err_unmap_tx:
 err_out_unmap:
 	pci_iounmap(pci_dev, ioaddr);
 err_out_cleardev:
-	pci_set_drvdata(pci_dev, NULL);
 	pci_release_regions(pci_dev);
  err_out:
 	free_netdev(net_dev);
@@ -2427,7 +2426,6 @@ static void sis900_remove(struct pci_dev *pci_dev)
 	pci_iounmap(pci_dev, sis_priv->ioaddr);
 	free_netdev(net_dev);
 	pci_release_regions(pci_dev);
-	pci_set_drvdata(pci_dev, NULL);
 }
 
 #ifdef CONFIG_PM
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH 3/5 net: bna: remove unnecessary pci_set_drvdata()

In reply to 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.

---
 drivers/net/ethernet/brocade/bna/bnad.c |    1 -
 1 file changed, 1 deletion(-)
drivers/net/ethernet/brocade/bna/bnad.c +0 -1
index 248bc37..3d151bd 100644
@@ -3262,7 +3262,6 @@ bnad_uninit(struct bnad *bnad)
 
 	if (bnad->bar0)
 		iounmap(bnad->bar0);
-	pci_set_drvdata(bnad->pcidev, NULL);
 }
 
 /*
Signature · 1 line
1.7.10.4
author
#3 lore raw

PATCH 4/5 net: ns83820: remove unnecessary pci_set_drvdata()

In reply to 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.

---
 drivers/net/ethernet/natsemi/ns83820.c |    2 --
 1 file changed, 2 deletions(-)
drivers/net/ethernet/natsemi/ns83820.c +0 -2
index d3b4700..e3e1e2f 100644
@@ -2236,7 +2236,6 @@ out_disable:
 	pci_disable_device(pci_dev);
 out_free:
 	free_netdev(ndev);
-	pci_set_drvdata(pci_dev, NULL);
 out:
 	return err;
 }
@@ -2260,7 +2259,6 @@ static void ns83820_remove_one(struct pci_dev *pci_dev)
 			dev->rx_info.descs, dev->rx_info.phy_descs);
 	pci_disable_device(dev->pci_dev);
 	free_netdev(ndev);
-	pci_set_drvdata(pci_dev, NULL);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ns83820_pci_tbl) = {
Signature · 1 line
1.7.10.4
author
#4 lore raw

PATCH 5/5 net: forcedeth: remove unnecessary pci_set_drvdata()

In reply to 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.

---
 drivers/net/ethernet/nvidia/forcedeth.c |    2 --
 1 file changed, 2 deletions(-)
drivers/net/ethernet/nvidia/forcedeth.c +0 -2
index 2d045be..48df587 100644
@@ -6018,7 +6018,6 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
 out_error:
 	if (phystate_orig)
 		writel(phystate|NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl);
-	pci_set_drvdata(pci_dev, NULL);
 out_freering:
 	free_rings(dev);
 out_unmap:
@@ -6089,7 +6088,6 @@ static void nv_remove(struct pci_dev *pci_dev)
 	pci_release_regions(pci_dev);
 	pci_disable_device(pci_dev);
 	free_netdev(dev);
-	pci_set_drvdata(pci_dev, NULL);
 }
 
 #ifdef CONFIG_PM_SLEEP
Signature · 1 line
1.7.10.4
maintainer
#5 lore raw
In reply to Jingoo Han

Can you please resubmit these pci_set_drvdata() patches (the IRDA, WAN, hippi, fiddi ones too) when I open the net-next tree back up?

Thank you.

author
#6 lore raw
Quoted 3 lines · David Miller

Can you please resubmit these pci_set_drvdata() patches (the IRDA, WAN, hippi, fiddi ones too) when I open the net-next tree back up?

I see. :-)
I will resubmit these patches, when you open the net-next tree. Thank you for your guidance.

Best regards,
Jingoo Han