diff options
| author | Andres More <more.andres@gmail.com> | 2010-06-22 20:43:39 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-23 15:20:21 -0700 |
| commit | 6cda24f5dfed742b58d732d13b26ccf7a34785a3 (patch) | |
| tree | 2965d232fdcf697be7ed01cdb8b2886846125a36 /drivers/staging/vt6656/main_usb.c | |
| parent | 054fa2267db683a42a84cbd32f8782ae020814b3 (diff) | |
| download | kernel_samsung_smdk4412-6cda24f5dfed742b58d732d13b26ccf7a34785a3.zip kernel_samsung_smdk4412-6cda24f5dfed742b58d732d13b26ccf7a34785a3.tar.gz kernel_samsung_smdk4412-6cda24f5dfed742b58d732d13b26ccf7a34785a3.tar.bz2 | |
Staging: vt6656: code cleanup of vt6656_disconnect()
Fixed style and debugging printks.
Not replaced PSDevice here, nor removed wireless_send_event() yet.
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/main_usb.c')
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 8e61cfd..6a04245 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -1279,51 +1279,36 @@ device_release_WPADEV(pDevice); return 0; } - static void __devexit vt6656_disconnect(struct usb_interface *intf) { + PSDevice device = usb_get_intfdata(intf); - PSDevice pDevice = usb_get_intfdata(intf); - - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_disconnect1.. \n"); - if (pDevice == NULL) - return; + if (!device) + return; #ifdef SndEvt_ToAPI -{ - union iwreq_data wrqu; - memset(&wrqu, 0, sizeof(wrqu)); - wrqu.data.flags = RT_RMMOD_EVENT_FLAG; - wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); -} + { + union iwreq_data req; + memset(&req, 0, sizeof(req)); + req.data.flags = RT_RMMOD_EVENT_FLAG; + wireless_send_event(device->dev, IWEVCUSTOM, &req, NULL); + } #endif -//2008-0714-01<Add>by MikeLiu -device_release_WPADEV(pDevice); + device_release_WPADEV(device); usb_set_intfdata(intf, NULL); -//2008-0922-01<Add>by MikeLiu, decrease usb counter. - usb_put_dev(interface_to_usbdev(intf)); - - pDevice->flags |= DEVICE_FLAGS_UNPLUG; - if (pDevice->dev != NULL) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "unregister_netdev..\n"); - unregister_netdev(pDevice->dev); - -//2008-07-21-01<Add>by MikeLiu -//unregister wpadev - if(wpa_set_wpadev(pDevice, 0)!=0) - printk("unregister wpadev fail?\n"); + usb_put_dev(interface_to_usbdev(intf)); - free_netdev(pDevice->dev); - } + device->flags |= DEVICE_FLAGS_UNPLUG; - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_disconnect3.. \n"); + if (device->dev) { + unregister_netdev(device->dev); + wpa_set_wpadev(device, 0); + free_netdev(device->dev); + } } - - - static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) { PSDevice pDevice=netdev_priv(dev); PBYTE pbMPDU; |