Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

5 files changed, 7 insertions, 20 deletions

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 8f402f85e1ca..afc84cfb61f9 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2534,9 +2534,6 @@ static struct usb_gadget_driver eth_driver = {
         .driver         = {
                 .name           = (char *) shortname,
                 .owner          = THIS_MODULE,
-                // .shutdown = ...
-                // .suspend = ...
-                // .resume = ...
         },
 };
 
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index c6c279de832e..9a4edc5657aa 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1738,9 +1738,6 @@ static struct usb_gadget_driver gadgetfs_driver = {
 
         .driver         = {
                 .name           = (char *) shortname,
-                // .shutdown = ...
-                // .suspend = ...
-                // .resume = ...
         },
 };
 
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 2e6926b33455..ba9acd531024 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -374,9 +374,6 @@ static struct usb_gadget_driver gs_gadget_driver = {
         .disconnect =           gs_disconnect,
         .driver = {
                 .name =         GS_SHORT_NAME,
-                /* .shutdown = ... */
-                /* .suspend = ...  */
-                /* .resume = ...   */
         },
 };
 
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 6c58636e914b..2fc110d3ad5a 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1303,9 +1303,6 @@ static struct usb_gadget_driver zero_driver = {
         .driver         = {
                 .name           = (char *) shortname,
                 .owner          = THIS_MODULE,
-                // .shutdown = ...
-                // .suspend = ...
-                // .resume = ...
         },
 };
 
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 664139afcfa9..e9f9f4bafa17 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -37,11 +37,6 @@ static int usb_serial_device_match (struct device *dev, struct device_driver *dr
         return 0;
 }
 
-struct bus_type usb_serial_bus_type = {
-        .name =         "usb-serial",
-        .match =        usb_serial_device_match,
-};
-
 static int usb_serial_device_probe (struct device *dev)
 {
         struct usb_serial_driver *driver;
@@ -109,14 +104,18 @@ exit:
         return retval;
 }
 
+struct bus_type usb_serial_bus_type = {
+        .name =         "usb-serial",
+        .match =        usb_serial_device_match,
+        .probe =        usb_serial_device_probe,
+        .remove =       usb_serial_device_remove,
+};
+
 int usb_serial_bus_register(struct usb_serial_driver *driver)
 {
         int retval;
 
         driver->driver.bus = &usb_serial_bus_type;
-        driver->driver.probe = usb_serial_device_probe;
-        driver->driver.remove = usb_serial_device_remove;
-
         retval = driver_register(&driver->driver);
 
         return retval;