staging: unisys: refactor VISORCHIPSET_BUSDEV_RESPONDERS

Get rid of the typedef and just use struct visorchipset_busdev_responders
instead. Fix CamelCase parameter names in the function pointer definitions for
the structure:

busNo => bus_no
devNo => dev_no

Update references to changed names.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index da14ef73f850b1b1f21bee2ca2fdaa5c55f182ec..f4c6ff1d9c390ed305c3b5b28d3ebcde849013f4 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -234,14 +234,14 @@ struct visorchipset_busdev_notifiers {
  *       0 = it worked
  *      -1 = it failed
  */
-typedef struct {
-       void (*bus_create)(ulong busNo, int response);
-       void (*bus_destroy)(ulong busNo, int response);
-       void (*device_create)(ulong busNo, ulong devNo, int response);
-       void (*device_destroy)(ulong busNo, ulong devNo, int response);
-       void (*device_pause)(ulong busNo, ulong devNo, int response);
-       void (*device_resume)(ulong busNo, ulong devNo, int response);
-} VISORCHIPSET_BUSDEV_RESPONDERS;
+struct visorchipset_busdev_responders {
+       void (*bus_create)(ulong bus_no, int response);
+       void (*bus_destroy)(ulong bus_no, int response);
+       void (*device_create)(ulong bus_no, ulong dev_no, int response);
+       void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
+       void (*device_pause)(ulong bus_no, ulong dev_no, int response);
+       void (*device_resume)(ulong bus_no, ulong dev_no, int response);
+};
 
 /** Register functions (in the bus driver) to get called by visorchipset
  *  whenever a bus or device appears for which this service partition is
@@ -252,7 +252,7 @@ typedef struct {
 void
 visorchipset_register_busdev_client(
                        struct visorchipset_busdev_notifiers *notifiers,
-                       VISORCHIPSET_BUSDEV_RESPONDERS *responders,
+                       struct visorchipset_busdev_responders *responders,
                        struct ultra_vbus_deviceinfo *driverInfo);
 
 /** Register functions (in the bus driver) to get called by visorchipset
@@ -264,7 +264,7 @@ visorchipset_register_busdev_client(
 void
 visorchipset_register_busdev_server(
                        struct visorchipset_busdev_notifiers *notifiers,
-                       VISORCHIPSET_BUSDEV_RESPONDERS *responders,
+                       struct visorchipset_busdev_responders *responders,
                        struct ultra_vbus_deviceinfo *driverInfo);
 
 typedef void (*SPARREPORTEVENT_COMPLETE_FUNC) (struct controlvm_message *msg,

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index ee0c88af11f051eca9c90272485534958651cf6a..12746e0a4e868e945240b16b0eb753c4819cb149 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -239,7 +239,7 @@ static void device_create_response(ulong busNo, ulong devNo, int response);
 static void device_destroy_response(ulong busNo, ulong devNo, int response);
 static void device_resume_response(ulong busNo, ulong devNo, int response);
 
-static VISORCHIPSET_BUSDEV_RESPONDERS BusDev_Responders = {
+static struct visorchipset_busdev_responders BusDev_Responders = {
        .bus_create = bus_create_response,
        .bus_destroy = bus_destroy_response,
        .device_create = device_create_response,
@@ -591,7 +591,7 @@ clear_chipset_events(void)
 void
 visorchipset_register_busdev_server(
                        struct visorchipset_busdev_notifiers *notifiers,
-                       VISORCHIPSET_BUSDEV_RESPONDERS *responders,
+                       struct visorchipset_busdev_responders *responders,
                        struct ultra_vbus_deviceinfo *driverInfo)
 {
        down(&NotifierLock);
@@ -616,7 +616,7 @@ EXPORT_SYMBOL_GPL(visorchipset_register_busdev_server);
 void
 visorchipset_register_busdev_client(
                        struct visorchipset_busdev_notifiers *notifiers,
-                       VISORCHIPSET_BUSDEV_RESPONDERS *responders,
+                       struct visorchipset_busdev_responders *responders,
                        struct ultra_vbus_deviceinfo *driverInfo)
 {
        down(&NotifierLock);
@@ -991,7 +991,7 @@ bus_epilog(u32 busNo,
        }
        if (notified)
                /* The callback function just called above is responsible
-                * for calling the appropriate VISORCHIPSET_BUSDEV_RESPONDERS
+                * for calling the appropriate visorchipset_busdev_responders
                 * function, which will call bus_responder()
                 */
                ;
@@ -1090,7 +1090,7 @@ device_epilog(u32 busNo, u32 devNo, struct spar_segment_state state, u32 cmd,
        }
        if (notified)
                /* The callback function just called above is responsible
-                * for calling the appropriate VISORCHIPSET_BUSDEV_RESPONDERS
+                * for calling the appropriate visorchipset_busdev_responders
                 * function, which will call device_responder()
                 */
                ;