diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8192su/r8192U_pm.c | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192su/r8192U_pm.c')
-rw-r--r-- | drivers/staging/rtl8192su/r8192U_pm.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/drivers/staging/rtl8192su/r8192U_pm.c b/drivers/staging/rtl8192su/r8192U_pm.c deleted file mode 100644 index 60d739b..0000000 --- a/drivers/staging/rtl8192su/r8192U_pm.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - Power management interface routines. - Written by Mariusz Matuszek. - This code is currently just a placeholder for later work and - does not do anything useful. - - This is part of rtl8180 OpenSource driver. - Copyright (C) Andrea Merello 2004 <andreamrl@tiscali.it> - Released under the terms of GPL (General Public Licence) -*/ - -#include "r8192U.h" -#include "r8192U_pm.h" - -/*****************************************************************************/ -int rtl8192U_save_state (struct pci_dev *dev, u32 state) -{ - printk(KERN_NOTICE "r8192U save state call (state %u).\n", state); - return(-EAGAIN); -} - -int rtl8192U_suspend(struct usb_interface *intf, pm_message_t state) -{ - struct net_device *dev = usb_get_intfdata(intf); - - RT_TRACE(COMP_POWER, "============> r8192U suspend call.\n"); - - if(dev) { - if (!netif_running(dev)) { - printk(KERN_WARNING "netif not running, go out suspend function\n"); - return 0; - } - - if (dev->netdev_ops->ndo_stop) - dev->netdev_ops->ndo_stop(dev); - - mdelay(10); - - netif_device_detach(dev); - } - - return 0; -} - -int rtl8192U_resume (struct usb_interface *intf) -{ - struct net_device *dev = usb_get_intfdata(intf); - - RT_TRACE(COMP_POWER, "================>r8192U resume call."); - - if(dev) { - if (!netif_running(dev)){ - printk(KERN_WARNING "netif not running, go out resume function\n"); - return 0; - } - - netif_device_attach(dev); - - if (dev->netdev_ops->ndo_open) - dev->netdev_ops->ndo_open(dev); - } - - return 0; -} - -int rtl8192U_enable_wake (struct pci_dev *dev, u32 state, int enable) -{ - printk(KERN_NOTICE "r8192U enable wake call (state %u, enable %d).\n", - state, enable); - return(-EAGAIN); -} - |