staging: unisys: visorbus: renamed functions like chipset_device_* to match driver...

Renamed functions
* chipset_device_create() to visorchipset_device_create()
* chipset_device_destroy() to visorchipset_device_destroy()
* chipset_device_pause() to visorchipset_device_pause()
* chipset_device_resume() to visorchipset_device_resume()

Signed-off-by: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 5ba807ccc45bfafaeb832f30896b6f5c25104fde..f0b08d1d98c126f40ca17741f9b1b51d4dae0088 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -1099,7 +1099,7 @@ visorchipset_bus_destroy(struct visor_device *dev)
 }
 
 int
-chipset_device_create(struct visor_device *dev_info)
+visorchipset_device_create(struct visor_device *dev_info)
 {
        int err;
 
@@ -1113,7 +1113,7 @@ chipset_device_create(struct visor_device *dev_info)
 }
 
 void
-chipset_device_destroy(struct visor_device *dev_info)
+visorchipset_device_destroy(struct visor_device *dev_info)
 {
        remove_visor_device(dev_info);
 
@@ -1211,7 +1211,7 @@ initiate_chipset_device_pause_resume(struct visor_device *dev, bool is_pause)
 }
 
 /**
- * chipset_device_pause() - start a pause operation for a visor device
+ * visorchipset_device_pause() - start a pause operation for a visor device
  * @dev_info: struct visor_device identifying the device being paused
  *
  * Tell the subordinate function driver for a specific device to pause
@@ -1219,7 +1219,7 @@ initiate_chipset_device_pause_resume(struct visor_device *dev, bool is_pause)
  * via a callback function; see pause_state_change_complete().
  */
 int
-chipset_device_pause(struct visor_device *dev_info)
+visorchipset_device_pause(struct visor_device *dev_info)
 {
        int err;
 
@@ -1234,7 +1234,7 @@ chipset_device_pause(struct visor_device *dev_info)
 }
 
 /**
- * chipset_device_resume() - start a resume operation for a visor device
+ * visorchipset_device_resume() - start a resume operation for a visor device
  * @dev_info: struct visor_device identifying the device being resumed
  *
  * Tell the subordinate function driver for a specific device to resume
@@ -1242,7 +1242,7 @@ chipset_device_pause(struct visor_device *dev_info)
  * via a callback function; see resume_state_change_complete().
  */
 int
-chipset_device_resume(struct visor_device *dev_info)
+visorchipset_device_resume(struct visor_device *dev_info)
 {
        int err;
 

diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
index 3c8993595b254c259865205a4a92bae98b895b3b..98a5af19189db32e528982518777ddbc0338f47e 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/staging/unisys/visorbus/visorbus_private.h
@@ -29,10 +29,10 @@
 
 int visorchipset_bus_create(struct visor_device *bus_info);
 void visorchipset_bus_destroy(struct visor_device *bus_info);
-int chipset_device_create(struct visor_device *dev_info);
-void chipset_device_destroy(struct visor_device *dev_info);
-int chipset_device_pause(struct visor_device *dev_info);
-int chipset_device_resume(struct visor_device *dev_info);
+int visorchipset_device_create(struct visor_device *dev_info);
+void visorchipset_device_destroy(struct visor_device *dev_info);
+int visorchipset_device_pause(struct visor_device *dev_info);
+int visorchipset_device_resume(struct visor_device *dev_info);
 
 void visorbus_create_response(struct visor_device *p, int response);
 void visorbus_destroy_response(struct visor_device *p, int response);

diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index eea70f43e5a1657cdd747bcccbe4f8da819f09dc..f9ef864ca15ef10eba0da01f401a65c079b89e29 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -824,8 +824,8 @@ my_device_create(struct controlvm_message *inmsg)
                       sizeof(struct controlvm_message_header));
                dev_info->pending_msg_hdr = pmsg_hdr;
        }
-       /* Chipset_device_create will send response */
-       err = chipset_device_create(dev_info);
+       /* visorchipset_device_create will send response */
+       err = visorchipset_device_create(dev_info);
        if (err)
                goto err_destroy_visorchannel;
 
@@ -882,16 +882,16 @@ my_device_changestate(struct controlvm_message *inmsg)
 
        if (state.alive == segment_state_running.alive &&
            state.operating == segment_state_running.operating)
-               /* Response will be sent from chipset_device_resume */
-               err = chipset_device_resume(dev_info);
+               /* Response will be sent from visorchipset_device_resume */
+               err = visorchipset_device_resume(dev_info);
        /* ServerNotReady / ServerLost / SegmentStateStandby */
        else if (state.alive == segment_state_standby.alive &&
                 state.operating == segment_state_standby.operating)
                /*
                 * technically this is standby case where server is lost.
-                * Response will be sent from chipset_device_pause.
+                * Response will be sent from visorchipset_device_pause.
                 */
-               err = chipset_device_pause(dev_info);
+               err = visorchipset_device_pause(dev_info);
        if (err)
                goto err_respond;
 
@@ -941,7 +941,7 @@ my_device_destroy(struct controlvm_message *inmsg)
                dev_info->pending_msg_hdr = pmsg_hdr;
        }
 
-       chipset_device_destroy(dev_info);
+       visorchipset_device_destroy(dev_info);
        return 0;
 
 err_respond: