summaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8188eu/os_dep/usb_intf.c
diff options
context:
space:
mode:
authornavin patidar <navin.patidar@gmail.com>2014-06-01 17:46:33 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 15:30:02 -0700
commit591207d9bf63fb419e35f06591ad8a35f2398945 (patch)
tree9278d91667c33bb7d2c6c7cbe55ce73eff835b40 /drivers/staging/rtl8188eu/os_dep/usb_intf.c
parent7922fd1a5c6800bb55e4a8371acbd109a7b0b505 (diff)
staging: rtl8188eu: Remove struct rtw_usb_drv
struct rtw_usb_drv contains only one member usb_driver structure, so no use of keeping it. Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/os_dep/usb_intf.c')
-rw-r--r--drivers/staging/rtl8188eu/os_dep/usb_intf.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index c99b9c2db132..d33aeb9aa684 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -60,22 +60,16 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
MODULE_DEVICE_TABLE(usb, rtw_usb_id_tbl);
-struct rtw_usb_drv {
- struct usb_driver usbdrv;
+static struct usb_driver rtl8188e_usb_drv = {
+ .name = "r8188eu",
+ .probe = rtw_drv_init,
+ .disconnect = rtw_dev_remove,
+ .id_table = rtw_usb_id_tbl,
+ .suspend = rtw_suspend,
+ .resume = rtw_resume,
+ .reset_resume = rtw_resume,
};
-static struct rtw_usb_drv rtl8188e_usb_drv = {
- .usbdrv.name = "r8188eu",
- .usbdrv.probe = rtw_drv_init,
- .usbdrv.disconnect = rtw_dev_remove,
- .usbdrv.id_table = rtw_usb_id_tbl,
- .usbdrv.suspend = rtw_suspend,
- .usbdrv.resume = rtw_resume,
- .usbdrv.reset_resume = rtw_resume,
-};
-
-static struct rtw_usb_drv *usb_drv = &rtl8188e_usb_drv;
-
static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
{
u8 rst = _SUCCESS;
@@ -730,7 +724,7 @@ static int __init rtw_drv_entry(void)
DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
- return usb_register(&usb_drv->usbdrv);
+ return usb_register(&rtl8188e_usb_drv);
}
static void __exit rtw_drv_halt(void)
@@ -738,7 +732,7 @@ static void __exit rtw_drv_halt(void)
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_halt\n"));
DBG_88E("+rtw_drv_halt\n");
- usb_deregister(&usb_drv->usbdrv);
+ usb_deregister(&rtl8188e_usb_drv);
DBG_88E("-rtw_drv_halt\n");
}