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

Commit baf785ba authored Oct 18, 2013 by David S. Miller

Merge branch 'pci_set_drvdata'



Jingoo Han says:

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

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: David S. Miller <davem@davemloft.net>

parents 5cda73b6 6d2d83e6

drivers/net/ethernet/3com/typhoon.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2525,7 +2525,6 @@ typhoon_remove_one(struct pci_dev *pdev)
	pci_release_regions(pdev);		pci_release_regions(pdev);
	pci_clear_mwi(pdev);		pci_clear_mwi(pdev);
	pci_disable_device(pdev);		pci_disable_device(pdev);
	pci_set_drvdata(pdev, NULL);
	free_netdev(dev);		free_netdev(dev);
	}		}

drivers/net/ethernet/8390/ne2k-pci.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -389,9 +389,7 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,
	free_netdev (dev);		free_netdev (dev);
	err_out_free_res:		err_out_free_res:
	release_region (ioaddr, NE_IO_EXTENT);		release_region (ioaddr, NE_IO_EXTENT);
	pci_set_drvdata (pdev, NULL);
	return -ENODEV;		return -ENODEV;

	}		}

	/*		/*
	@@ -655,7 +653,6 @@ static void ne2k_pci_remove_one(struct pci_dev *pdev)
	release_region(dev->base_addr, NE_IO_EXTENT);		release_region(dev->base_addr, NE_IO_EXTENT);
	free_netdev(dev);		free_netdev(dev);
	pci_disable_device(pdev);		pci_disable_device(pdev);
	pci_set_drvdata(pdev, NULL);
	}		}

	#ifdef CONFIG_PM		#ifdef CONFIG_PM

drivers/net/ethernet/adaptec/starfire.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -835,7 +835,6 @@ static int starfire_init_one(struct pci_dev *pdev,
	return 0;		return 0;

	err_out_cleardev:		err_out_cleardev:
	pci_set_drvdata(pdev, NULL);
	iounmap(base);		iounmap(base);
	err_out_free_res:		err_out_free_res:
	pci_release_regions (pdev);		pci_release_regions (pdev);
	@@ -2012,7 +2011,6 @@ static void starfire_remove_one(struct pci_dev *pdev)
	iounmap(np->base);		iounmap(np->base);
	pci_release_regions(pdev);		pci_release_regions(pdev);

	pci_set_drvdata(pdev, NULL);
	free_netdev(dev); /* Will also free np!! */		free_netdev(dev); /* Will also free np!! */
	}		}

drivers/net/ethernet/amd/amd8111e.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1711,7 +1711,6 @@ static void amd8111e_remove_one(struct pci_dev *pdev)
	free_netdev(dev);		free_netdev(dev);
	pci_release_regions(pdev);		pci_release_regions(pdev);
	pci_disable_device(pdev);		pci_disable_device(pdev);
	pci_set_drvdata(pdev, NULL);
	}		}
	}		}
	static void amd8111e_config_ipg(struct net_device* dev)		static void amd8111e_config_ipg(struct net_device* dev)
	@@ -1967,7 +1966,6 @@ static int amd8111e_probe_one(struct pci_dev *pdev,

	err_disable_pdev:		err_disable_pdev:
	pci_disable_device(pdev);		pci_disable_device(pdev);
	pci_set_drvdata(pdev, NULL);
	return err;		return err;

	}		}

drivers/net/ethernet/amd/pcnet32.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2818,7 +2818,6 @@ static void pcnet32_remove_one(struct pci_dev *pdev)
	lp->init_block, lp->init_dma_addr);		lp->init_block, lp->init_dma_addr);
	free_netdev(dev);		free_netdev(dev);
	pci_disable_device(pdev);		pci_disable_device(pdev);
	pci_set_drvdata(pdev, NULL);
	}		}
	}		}