diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-23 17:35:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-27 21:52:47 -0700 |
| commit | d18c3db58bc544fce6662ca7edba616ca9788a70 (patch) | |
| tree | dd4c2d2c0bef6d47a32452112a9396a3137d8c10 /drivers/net/e100.c | |
| parent | 4002307d2b563a6ab317ca4d7eb1d201a6673d37 (diff) | |
| download | blackbird-op-linux-d18c3db58bc544fce6662ca7edba616ca9788a70.tar.gz blackbird-op-linux-d18c3db58bc544fce6662ca7edba616ca9788a70.zip | |
[PATCH] PCI: make drivers use the pci shutdown callback instead of the driver core callback.
Now we can change the pci core to always set this pointer, as pci drivers
should use it, not the driver core callback.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index cfaa6b2bf345..be973a1c3c53 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2440,9 +2440,8 @@ static int e100_resume(struct pci_dev *pdev) #endif -static void e100_shutdown(struct device *dev) +static void e100_shutdown(struct pci_dev *pdev) { - struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); struct net_device *netdev = pci_get_drvdata(pdev); struct nic *nic = netdev_priv(netdev); @@ -2463,11 +2462,7 @@ static struct pci_driver e100_driver = { .suspend = e100_suspend, .resume = e100_resume, #endif - - .driver = { - .shutdown = e100_shutdown, - } - + .shutdown = e100_shutdown, }; static int __init e100_init_module(void) |
