[PATCH] USBATM: remove .owner

Remove the unused .owner field in struct usbatm_driver.

Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

5 files changed, 1 insertions, 7 deletions

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index fc130b2171aa..0b02a6d9f243 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -833,7 +833,6 @@ static const struct usb_device_id cxacru_usb_ids[] = {
 MODULE_DEVICE_TABLE(usb, cxacru_usb_ids);
 
 static struct usbatm_driver cxacru_driver = {
-        .owner          = THIS_MODULE,
         .driver_name    = cxacru_driver_name,
         .bind           = cxacru_bind,
         .heavy_init     = cxacru_heavy_init,
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 7b60d159dbed..1aca0b08f192 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -793,7 +793,6 @@ static void speedtch_unbind(struct usbatm_data *usbatm, struct usb_interface *in
 ***********/
 
 static struct usbatm_driver speedtch_usbatm_driver = {
-        .owner          = THIS_MODULE,
         .driver_name    = speedtch_driver_name,
         .bind           = speedtch_bind,
         .heavy_init     = speedtch_heavy_init,
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index 3ba896291eb4..aa072ad953a6 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1629,7 +1629,7 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
         if (ifnum != UEA_INTR_IFACE_NO)
                 return -ENODEV;
 
-        usbatm_instance->flags = (sync_wait[modem_index] ? 0 : UDSL_SKIP_HEAVY_INIT);
+        usbatm->flags = (sync_wait[modem_index] ? 0 : UDSL_SKIP_HEAVY_INIT);
 
         /* interface 1 is for outbound traffic */
         ret = claim_interface(usb, usbatm, UEA_US_IFACE_NO);
@@ -1701,7 +1701,6 @@ static void uea_unbind(struct usbatm_data *usbatm, struct usb_interface *intf)
 
 static struct usbatm_driver uea_usbatm_driver = {
         .driver_name = "ueagle-atm",
-        .owner = THIS_MODULE,
         .bind = uea_bind,
         .atm_start = uea_atm_open,
         .unbind = uea_unbind,
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index b29eb807f203..4b923a83555e 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -100,8 +100,6 @@ struct usbatm_data;
 */
 
 struct usbatm_driver {
-        struct module *owner;
-
         const char *driver_name;
 
         /* init device ... can sleep, or cause probe() failure */
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index 172c82174397..ad5d3ff88dd9 100644
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -166,7 +166,6 @@ static int __init xusbatm_init(void)
                 xusbatm_usb_ids[i].idProduct    = product[i];
 
 
-                xusbatm_drivers[i].owner        = THIS_MODULE;
                 xusbatm_drivers[i].driver_name  = xusbatm_driver_name;
                 xusbatm_drivers[i].bind         = xusbatm_bind;
                 xusbatm_drivers[i].unbind       = xusbatm_unbind;