Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b138131 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pci_set_drvdata' 



Jingoo Han says:

====================
net: ethernet: remove unnecessary pci_set_drvdata() part 3

Since commit 0998d063
(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: default avatarDavid S. Miller <davem@davemloft.net>
parents bda301c9 877a22cd

drivers/net/ethernet/pasemi/pasemi_mac.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+0 −2
Original line number Diff line number Diff line
@@ -1630,7 +1630,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	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);

}

drivers/net/ethernet/qlogic/qla3xxx.c

+0 −2
Original line number Diff line number Diff line
@@ -3916,7 +3916,6 @@ static int ql3xxx_probe(struct pci_dev *pdev, 
	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);

}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2406,7 +2406,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	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);

drivers/net/ethernet/qlogic/qlge/qlge_main.c

+0 −1
Original line number Diff line number Diff line
@@ -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,