[PATCH] USB Serial: get rid of the .owner field in usb_serial_driver

Don't duplicate something that's already in struct driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 97e7d9e53e39..124d46e76a2e 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -571,7 +571,9 @@ static struct usb_device_id keyspan_4port_ids[] = {
 
 /* Structs for the devices, pre and post renumeration. */
 static struct usb_serial_driver keyspan_pre_device = {
-        .owner                  = THIS_MODULE,
+        .driver = {
+                .owner          = THIS_MODULE,
+        },
         .name                   = "Keyspan - (without firmware)",
         .short_name             = "keyspan_no_firm",
         .id_table               = keyspan_pre_ids,
@@ -583,7 +585,9 @@ static struct usb_serial_driver keyspan_pre_device = {
 };
 
 static struct usb_serial_driver keyspan_1port_device = {
-        .owner                  = THIS_MODULE,
+        .driver = {
+                .owner          = THIS_MODULE,
+        },
         .name                   = "Keyspan 1 port adapter",
         .short_name             = "keyspan_1",
         .id_table               = keyspan_1port_ids,
@@ -608,7 +612,9 @@ static struct usb_serial_driver keyspan_1port_device = {
 };
 
 static struct usb_serial_driver keyspan_2port_device = {
-        .owner                  = THIS_MODULE,
+        .driver = {
+                .owner          = THIS_MODULE,
+        },
         .name                   = "Keyspan 2 port adapter",
         .short_name             = "keyspan_2",
         .id_table               = keyspan_2port_ids,
@@ -633,7 +639,9 @@ static struct usb_serial_driver keyspan_2port_device = {
 };
 
 static struct usb_serial_driver keyspan_4port_device = {
-        .owner                  = THIS_MODULE,
+        .driver = {
+                .owner          = THIS_MODULE,
+        },
         .name                   = "Keyspan 4 port adapter",
         .short_name             = "keyspan_4",
         .id_table               = keyspan_4port_ids,