git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
pci-skeleton.c
diff --git
a/drivers/net/pci-skeleton.c
b/drivers/net/pci-skeleton.c
index
f931248
..
bb1c3d8
100644
(file)
--- a/
drivers/net/pci-skeleton.c
+++ b/
drivers/net/pci-skeleton.c
@@
-481,7
+481,6
@@
struct netdrv_private {
unsigned int mediasense:1; /* Media sensing in progress. */
spinlock_t lock;
chip_t chipset;
unsigned int mediasense:1; /* Media sensing in progress. */
spinlock_t lock;
chip_t chipset;
- u32 pci_state[16]; /* Data saved during suspend */
};
MODULE_AUTHOR ("Jeff Garzik <jgarzik@pobox.com>");
};
MODULE_AUTHOR ("Jeff Garzik <jgarzik@pobox.com>");
@@
-796,7
+795,7
@@
static int __devinit netdrv_init_one (struct pci_dev *pdev,
tp->pci_dev = pdev;
tp->board = ent->driver_data;
tp->mmio_addr = ioaddr;
tp->pci_dev = pdev;
tp->board = ent->driver_data;
tp->mmio_addr = ioaddr;
-
tp->lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&tp->lock)
;
pci_set_drvdata(pdev, dev);
pci_set_drvdata(pdev, dev);
@@
-1921,8
+1920,8
@@
static int netdrv_suspend (struct pci_dev *pdev, u32 state)
spin_unlock_irqrestore (&tp->lock, flags);
spin_unlock_irqrestore (&tp->lock, flags);
- pci_save_state (pdev
, tp->pci_state
);
- pci_set_power_state (pdev,
3
);
+ pci_save_state (pdev);
+ pci_set_power_state (pdev,
PCI_D3hot
);
return 0;
}
return 0;
}
@@
-1935,8
+1934,8
@@
static int netdrv_resume (struct pci_dev *pdev)
if (!netif_running(dev))
return 0;
if (!netif_running(dev))
return 0;
- pci_set_power_state (pdev, 0);
- pci_restore_state (pdev
, tp->pci_state
);
+ pci_set_power_state (pdev,
PCI_D
0);
+ pci_restore_state (pdev);
netif_device_attach (dev);
netdrv_hw_start (dev);
netif_device_attach (dev);
netdrv_hw_start (dev);