Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-drm-fsl-dcu.git] / drivers / input / gameport / gameport.c

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 79dfb4b25c97126ef1817bafb28195073f0727d7..a00fe470a8292847f3607df00973440a98d43d45 100644 (file)
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -731,12 +731,6 @@ static int gameport_driver_remove(struct device *dev)
        return 0;
 }
 
-static struct bus_type gameport_bus = {
-       .name   = "gameport",
-       .probe  = gameport_driver_probe,
-       .remove = gameport_driver_remove,
-};
-
 static void gameport_add_driver(struct gameport_driver *drv)
 {
        int error;
@@ -782,6 +776,15 @@ static int gameport_bus_match(struct device *dev, struct device_driver *drv)
        return !gameport_drv->ignore;
 }
 
+static struct bus_type gameport_bus = {
+       .name           = "gameport",
+       .dev_attrs      = gameport_device_attrs,
+       .drv_attrs      = gameport_driver_attrs,
+       .match          = gameport_bus_match,
+       .probe          = gameport_driver_probe,
+       .remove         = gameport_driver_remove,
+};
+
 static void gameport_set_drv(struct gameport *gameport, struct gameport_driver *drv)
 {
        mutex_lock(&gameport->drv_mutex);
@@ -791,7 +794,6 @@ static void gameport_set_drv(struct gameport *gameport, struct gameport_driver *
 
 int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode)
 {
-
        if (gameport->open) {
                if (gameport->open(gameport, mode)) {
                        return -1;
@@ -819,9 +821,6 @@ static int __init gameport_init(void)
 {
        int error;
 
-       gameport_bus.dev_attrs = gameport_device_attrs;
-       gameport_bus.drv_attrs = gameport_driver_attrs;
-       gameport_bus.match = gameport_bus_match;
        error = bus_register(&gameport_bus);
        if (error) {
                printk(KERN_ERR "gameport: failed to register gameport bus, error: %d\n", error);