leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: power management for kaweth

Browse Source 
- implements suspend when the network interface is down
- fixes a typo in comments
- adds debugging output for power management
- fixes a compiler warning

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum 2007-01-16 09:47:12 +01:00 committed by Greg Kroah-Hartman
parent 511779fd9e
commit b98b98f97c
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/usb/net/kaweth.c
View File

@ -179,6 +179,7 @@ static struct usb_driver kaweth_driver = {
.suspend = kaweth_suspend, .suspend = kaweth_suspend,
.resume = kaweth_resume, .resume = kaweth_resume,
.id_table = usb_klsi_table, .id_table = usb_klsi_table,
.supports_autosuspend = 1,
}; };
typedef __u8 eth_addr_t[6]; typedef __u8 eth_addr_t[6];
@ -225,6 +226,7 @@ struct kaweth_device
struct delayed_work lowmem_work; struct delayed_work lowmem_work;
struct usb_device *dev; struct usb_device *dev;
struct usb_interface *intf;
struct net_device *net; struct net_device *net;
wait_queue_head_t term_wait; wait_queue_head_t term_wait;
@ -662,9 +664,14 @@ static int kaweth_open(struct net_device *net)
dbg("Opening network device."); dbg("Opening network device.");
res = usb_autopm_get_interface(kaweth->intf);
if (res) {
err("Interface cannot be resumed.");
return -EIO;
}
res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL); res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL);
if (res) if (res)
return -EIO; goto err_out;
usb_fill_int_urb( usb_fill_int_urb(
kaweth->irq_urb, kaweth->irq_urb,
@ -681,7 +688,7 @@ static int kaweth_open(struct net_device *net)
res = usb_submit_urb(kaweth->irq_urb, GFP_KERNEL); res = usb_submit_urb(kaweth->irq_urb, GFP_KERNEL);
if (res) { if (res) {
usb_kill_urb(kaweth->rx_urb); usb_kill_urb(kaweth->rx_urb);
return -EIO; goto err_out;
} }
kaweth->opened = 1; kaweth->opened = 1;
@ -689,10 +696,14 @@ static int kaweth_open(struct net_device *net)
kaweth_async_set_rx_mode(kaweth); kaweth_async_set_rx_mode(kaweth);
return 0; return 0;
err_out:
usb_autopm_enable(kaweth->intf);
return -EIO;
} }
/**************************************************************** /****************************************************************
* kaweth_close * kaweth_kill_urbs
****************************************************************/ ****************************************************************/
static void kaweth_kill_urbs(struct kaweth_device *kaweth) static void kaweth_kill_urbs(struct kaweth_device *kaweth)
{ {
@ -724,6 +735,8 @@ static int kaweth_close(struct net_device *net)
kaweth->status &= ~KAWETH_STATUS_CLOSING; kaweth->status &= ~KAWETH_STATUS_CLOSING;
usb_autopm_enable(kaweth->intf);
return 0; return 0;
} }
@ -908,6 +921,7 @@ static int kaweth_suspend(struct usb_interface *intf, pm_message_t message)
struct kaweth_device *kaweth = usb_get_intfdata(intf); struct kaweth_device *kaweth = usb_get_intfdata(intf);
unsigned long flags; unsigned long flags;
dbg("Suspending device");
spin_lock_irqsave(&kaweth->device_lock, flags); spin_lock_irqsave(&kaweth->device_lock, flags);
kaweth->status |= KAWETH_STATUS_SUSPENDING; kaweth->status |= KAWETH_STATUS_SUSPENDING;
spin_unlock_irqrestore(&kaweth->device_lock, flags); spin_unlock_irqrestore(&kaweth->device_lock, flags);
@ -924,6 +938,7 @@ static int kaweth_resume(struct usb_interface *intf)
struct kaweth_device *kaweth = usb_get_intfdata(intf); struct kaweth_device *kaweth = usb_get_intfdata(intf);
unsigned long flags; unsigned long flags;
dbg("Resuming device");
spin_lock_irqsave(&kaweth->device_lock, flags); spin_lock_irqsave(&kaweth->device_lock, flags);
kaweth->status &= ~KAWETH_STATUS_SUSPENDING; kaweth->status &= ~KAWETH_STATUS_SUSPENDING;
spin_unlock_irqrestore(&kaweth->device_lock, flags); spin_unlock_irqrestore(&kaweth->device_lock, flags);
@ -1086,6 +1101,8 @@ err_fw:
dbg("Initializing net device."); dbg("Initializing net device.");
kaweth->intf = intf;
kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL); kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!kaweth->tx_urb) if (!kaweth->tx_urb)
goto err_free_netdev; goto err_free_netdev;
@ -1265,7 +1282,7 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev,
{ {
struct urb *urb; struct urb *urb;
int retv; int retv;
int length; int length = 0; /* shut up GCC */
urb = usb_alloc_urb(0, GFP_NOIO); urb = usb_alloc_urb(0, GFP_NOIO);
if (!urb) if (!urb)