staging: unisys: remove visorbus_type extern

The variable visorbus_type could be contained to the visorbus_main.c
file by moving the two functions that referenced it visorchipset.c. This
allowed us to remove the incorrect extern from the include file visorbus.h.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h
index 6f27e005593833ddca3258a3257bf89efb193630..6d379e641ed3e770bd7270c197c769e64271a203 100644 (file)
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -31,8 +31,6 @@
 
 #include "channel.h"
 
-extern struct bus_type visorbus_type;
-
 struct visorchipset_state {
        u32 created:1;
        u32 attached:1;

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index c455784f272a8211952ac90e243d38698b9a7de3..3b11fb06915146782b240b08192f5a4eb5499746 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -159,13 +159,48 @@ static int visorbus_match(struct device *xdev, struct device_driver *xdrv)
  * This describes the TYPE of bus.
  * (Don't confuse this with an INSTANCE of the bus.)
  */
-struct bus_type visorbus_type = {
+static struct bus_type visorbus_type = {
        .name = "visorbus",
        .match = visorbus_match,
        .uevent = visorbus_uevent,
        .dev_groups = visorbus_dev_groups,
 };
 
+struct visor_busdev {
+       u32 bus_no;
+       u32 dev_no;
+};
+
+static int match_visorbus_dev_by_id(struct device *dev, void *data)
+{
+       struct visor_device *vdev = to_visor_device(dev);
+       struct visor_busdev *id = data;
+
+       if ((vdev->chipset_bus_no == id->bus_no) &&
+           (vdev->chipset_dev_no == id->dev_no))
+               return 1;
+       return 0;
+}
+
+struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
+                                              struct visor_device *from)
+{
+       struct device *dev;
+       struct device *dev_start = NULL;
+       struct visor_busdev id = {
+               .bus_no = bus_no,
+               .dev_no = dev_no
+       };
+
+       if (from)
+               dev_start = &from->device;
+       dev = bus_find_device(&visorbus_type, dev_start, (void *)&id,
+                             match_visorbus_dev_by_id);
+       if (!dev)
+               return NULL;
+       return to_visor_device(dev);
+}
+
 /*
  * visorbus_release_busdevice() - called when device_unregister() is called for
  *                                the bus device instance, after all other tasks

diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
index 91f788aa9a87bbd27b55af1d9e61041fbb8d4eb9..841437f41d752ceff672137859c16aab0637e580 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/staging/unisys/visorbus/visorbus_private.h
@@ -23,6 +23,8 @@
 #include "vbuschannel.h"
 #include "visorbus.h"
 
+struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
+                                              struct visor_device *from);
 int visorbus_create_instance(struct visor_device *dev);
 void visorbus_remove_instance(struct visor_device *bus_info);
 int create_visor_device(struct visor_device *dev_info);

diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 80a078128bd14bdc0377f7942e14d86f37c01ac9..ab5c5c22450b9b68d0ede67dbffbd89056f48eb9 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -288,41 +288,6 @@ static ssize_t remaining_steps_store(struct device *dev,
 }
 static DEVICE_ATTR_RW(remaining_steps);
 
-struct visor_busdev {
-       u32 bus_no;
-       u32 dev_no;
-};
-
-static int match_visorbus_dev_by_id(struct device *dev, void *data)
-{
-       struct visor_device *vdev = to_visor_device(dev);
-       struct visor_busdev *id = data;
-
-       if ((vdev->chipset_bus_no == id->bus_no) &&
-           (vdev->chipset_dev_no == id->dev_no))
-               return 1;
-       return 0;
-}
-
-struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
-                                              struct visor_device *from)
-{
-       struct device *dev;
-       struct device *dev_start = NULL;
-       struct visor_busdev id = {
-               .bus_no = bus_no,
-               .dev_no = dev_no
-       };
-
-       if (from)
-               dev_start = &from->device;
-       dev = bus_find_device(&visorbus_type, dev_start, (void *)&id,
-                             match_visorbus_dev_by_id);
-       if (!dev)
-               return NULL;
-       return to_visor_device(dev);
-}
-
 static void controlvm_init_response(struct controlvm_message *msg,
                                    struct controlvm_message_header *msg_hdr,
                                    int response)