1 files changed, 24 insertions, 16 deletions

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index e9b45b768aca..5cfc13b5e56f 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -570,10 +570,12 @@ static struct usb_device_id keyspan_4port_ids[] = {
 };
 
 /* Structs for the devices, pre and post renumeration. */
-static struct usb_serial_device_type keyspan_pre_device = {
-        .owner                  = THIS_MODULE,
-        .name                   = "Keyspan - (without firmware)",
-        .short_name             = "keyspan_no_firm",
+static struct usb_serial_driver keyspan_pre_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "keyspan_no_firm",
+        },
+        .description            = "Keyspan - (without firmware)",
         .id_table               = keyspan_pre_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
         .num_bulk_in            = NUM_DONT_CARE,
@@ -582,10 +584,12 @@ static struct usb_serial_device_type keyspan_pre_device = {
         .attach                 = keyspan_fake_startup,
 };
 
-static struct usb_serial_device_type keyspan_1port_device = {
-        .owner                  = THIS_MODULE,
-        .name                   = "Keyspan 1 port adapter",
-        .short_name             = "keyspan_1",
+static struct usb_serial_driver keyspan_1port_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "keyspan_1",
+        },
+        .description            = "Keyspan 1 port adapter",
         .id_table               = keyspan_1port_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
         .num_bulk_in            = NUM_DONT_CARE,
@@ -607,10 +611,12 @@ static struct usb_serial_device_type keyspan_1port_device = {
         .shutdown               = keyspan_shutdown,
 };
 
-static struct usb_serial_device_type keyspan_2port_device = {
-        .owner                  = THIS_MODULE,
-        .name                   = "Keyspan 2 port adapter",
-        .short_name             = "keyspan_2",
+static struct usb_serial_driver keyspan_2port_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "keyspan_2",
+        },
+        .description            = "Keyspan 2 port adapter",
         .id_table               = keyspan_2port_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
         .num_bulk_in            = NUM_DONT_CARE,
@@ -632,10 +638,12 @@ static struct usb_serial_device_type keyspan_2port_device = {
         .shutdown               = keyspan_shutdown,
 };
 
-static struct usb_serial_device_type keyspan_4port_device = {
-        .owner                  = THIS_MODULE,
-        .name                   = "Keyspan 4 port adapter",
-        .short_name             = "keyspan_4",
+static struct usb_serial_driver keyspan_4port_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "keyspan_4",
+        },
+        .description            = "Keyspan 4 port adapter",
         .id_table               = keyspan_4port_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
         .num_bulk_in            = 5,