staging: unisys: Prep for removing 'info' structs

The visorbus driver has three _info structs lying around
(device, bus, channel) that store subsets of info from the
bigger structs.

Having these structs around make resource handling very difficult
and more complicated than it needs to be.  Use the device
infrastructure and instead pass 'struct visor_device' all
over the place.

In order to do that 'struct visor_device' needs to get smarter.
This patch adds the pieces to prep for it.  The new elements
will be used in later patches.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@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 6c551df1adc002e2596ca6e4c912392226703815..14f6f8e9426ddabe6ba92466ab9d501352c7c20e 100644 (file)
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -40,9 +40,18 @@
 
 struct visor_driver;
 struct visor_device;
+extern struct bus_type visorbus_type;
 
 typedef void (*visorbus_state_complete_func) (struct visor_device *dev,
                                              int status);
+struct visorchipset_state {
+       u32 created:1;
+       u32 attached:1;
+       u32 configured:1;
+       u32 running:1;
+       /* Add new fields above. */
+       /* Remaining bits in this 32-bit word are unused. */
+};
 
 /** This struct describes a specific Supervisor channel, by providing its
  *  GUID, name, and sizes.
@@ -141,6 +150,16 @@ struct visor_device {
        bool resuming;
        unsigned long chipset_bus_no;
        unsigned long chipset_dev_no;
+       struct visorchipset_state state;
+       uuid_le type;
+       uuid_le inst;
+       u8 *name;
+       u8 *description;
+       struct controlvm_message_header *pending_msg_hdr;
+       void *vbus_hdr_info;
+       u32 switch_no;
+       u32 internal_port_no;
+       uuid_le partition_uuid;
 };
 
 #define to_visor_device(x) container_of(x, struct visor_device, device)

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index c654c67b782fc845d93b21413c2c9b5d5ba6e82b..7dddb072a29e4e8f149593f669bb1564cb22171e 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -88,7 +88,7 @@ const struct attribute_group *visorbus_bus_groups[] = {
 /** This describes the TYPE of bus.
  *  (Don't confuse this with an INSTANCE of the bus.)
  */
-static struct bus_type visorbus_type = {
+struct bus_type visorbus_type = {
        .name = "visorbus",
        .match = visorbus_match,
        .uevent = visorbus_uevent,

diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
index 8326e4da56c14cc4e3e645082bd0a967113652ec..bbc64bd88e0a221fe3bd7453803aa23b4f49f42e 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/staging/unisys/visorbus/visorbus_private.h
@@ -27,15 +27,6 @@
 
 struct visorchannel;
 
-struct visorchipset_state {
-       u32 created:1;
-       u32 attached:1;
-       u32 configured:1;
-       u32 running:1;
-       /* Add new fields above. */
-       /* Remaining bits in this 32-bit word are unused. */
-};
-
 enum visorchipset_addresstype {
        /** address is guest physical, but outside of the physical memory
         *  region that is controlled by the running OS (this is the normal

diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index 2d3e4d6defead8d10d194aaba2d24f69dfcccf51..a9c3ae160ce549b72db613f810dba6cb09c3c60d 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -23,6 +23,7 @@
 #include "version.h"
 #include "visorbus.h"
 #include <linux/uuid.h>
+#include "controlvmchannel.h"
 
 #define MYDRVNAME "visorchannel"
 
@@ -44,6 +45,9 @@ struct visorchannel {
                struct signal_queue_header event_queue;
                struct signal_queue_header ack_queue;
        } safe_uis_queue;
+       struct irq_info intr;
+       uuid_le type;
+       uuid_le inst;
 };
 
 /* Creates the struct visorchannel abstraction for a data area in memory,