diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-28 16:20:10 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:31 -0700 |
commit | b6d11c07e5fca796e426329e76b0cc6ab400c0fd (patch) | |
tree | 2c9ffa41139fca9449740fd6ba8805cbdd97cdbb /drivers/staging/rtl8187se/r8180_core.c | |
parent | b72490a5f970051bb02602c69fa918fd53b512c9 (diff) |
Staging: rtl8187se: merge r8180_pm.c with r8180_core.c
* merge r8180_pm.c with r8180_core.c
* make functions static
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_core.c')
-rw-r--r-- | drivers/staging/rtl8187se/r8180_core.c | 63 |
1 files changed, 61 insertions, 2 deletions
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 18646827c8f..68756063d14 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c @@ -22,6 +22,9 @@ A big big thanks goes also to Realtek corp. for their help in my attempt to add RTL8185 and RTL8225 support, and to David Young also. + + Power management interface routines. + Written by Mariusz Matuszek. */ #undef RX_DONT_PASS_UL @@ -37,8 +40,6 @@ #include "r8180_wx.h" #include "r8180_dm.h" -#include "r8180_pm.h" - #include "ieee80211/dot11d.h" #ifndef PCI_VENDOR_ID_BELKIN @@ -121,6 +122,64 @@ static void rtl8180_shutdown (struct pci_dev *pdev) pci_disable_device(pdev); } +static int rtl8180_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct net_device *dev = pci_get_drvdata(pdev); + + if (!netif_running(dev)) + goto out_pci_suspend; + + if (dev->netdev_ops->ndo_stop) + dev->netdev_ops->ndo_stop(dev); + + netif_device_detach(dev); + +out_pci_suspend: + pci_save_state(pdev); + pci_disable_device(pdev); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); + return 0; +} + +static int rtl8180_resume(struct pci_dev *pdev) +{ + struct net_device *dev = pci_get_drvdata(pdev); + int err; + u32 val; + + pci_set_power_state(pdev, PCI_D0); + + err = pci_enable_device(pdev); + if (err) { + printk(KERN_ERR "%s: pci_enable_device failed on resume\n", + dev->name); + + return err; + } + + pci_restore_state(pdev); + + /* + * Suspend/Resume resets the PCI configuration space, so we have to + * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries + * from interfering with C3 CPU state. pci_restore_state won't help + * here since it only restores the first 64 bytes pci config header. + */ + pci_read_config_dword(pdev, 0x40, &val); + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + + if (!netif_running(dev)) + goto out; + + if (dev->netdev_ops->ndo_open) + dev->netdev_ops->ndo_open(dev); + + netif_device_attach(dev); +out: + return 0; +} + static struct pci_driver rtl8180_pci_driver = { .name = RTL8180_MODULE_NAME, /* Driver name */ .id_table = rtl8180_pci_id_tbl, /* PCI_ID table */ |