staging: unisys: visorbus: Convert visorchannel_signalremove() return val

Per Documentation/CodingStyle, function names that convey an action or an
imperative command should return an integer. This commit converts the
visorbus API function, visorchannel_signalremove(), to returning integer
values. All uses of this function are updated accordingly.

Signed-off-by: David Binder <david.binder@unisys.com>
Signed-off-by: David Kershner <david.kershner@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 2e508c2fc96c2244d9dde846f535cfb0f70e1df4..a4442c33bb8b3bbd549b403f33cab6d8a39be161 100644 (file)
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -200,8 +200,8 @@ enum diag_severity {
        DIAG_SEVERITY_PRINT = 4,
 };
 
-bool visorchannel_signalremove(struct visorchannel *channel, u32 queue,
-                              void *msg);
+int visorchannel_signalremove(struct visorchannel *channel, u32 queue,
+                             void *msg);
 bool visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
                               void *msg);
 bool visorchannel_signalempty(struct visorchannel *channel, u32 queue);

diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index fe5a62089d090cee3489a2ad013b2b58d8aa6ef5..70fcd1facd8aec91a8eefe0ecd8055987ccc2a5e 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -270,12 +270,12 @@ signalremove_inner(struct visorchannel *channel, u32 queue, void *msg)
  * @queue:   the queue the message will be removed from
  * @msg:     the message to remove
  *
- * Return: boolean indicating whether the removal succeeded or failed
+ * Return: integer error code indicating the status of the removal
  */
-bool
+int
 visorchannel_signalremove(struct visorchannel *channel, u32 queue, void *msg)
 {
-       bool rc;
+       int rc;
        unsigned long flags;
 
        if (channel->needs_lock) {
@@ -286,7 +286,7 @@ visorchannel_signalremove(struct visorchannel *channel, u32 queue, void *msg)
                rc = signalremove_inner(channel, queue, msg);
        }
 
-       return !rc;
+       return rc;
 }
 EXPORT_SYMBOL_GPL(visorchannel_signalremove);
 

diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index e95d04de4927421d7ee2f9528abff5ee27d75f1a..ed4eced1e2d222de053a77b0dbc4bb3631ef158e 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -2000,8 +2000,8 @@ handle_command(struct controlvm_message inmsg, u64 channel_addr)
 static bool
 read_controlvm_event(struct controlvm_message *msg)
 {
-       if (visorchannel_signalremove(controlvm_channel,
-                                     CONTROLVM_QUEUE_EVENT, msg)) {
+       if (!visorchannel_signalremove(controlvm_channel,
+                                      CONTROLVM_QUEUE_EVENT, msg)) {
                /* got a message */
                if (msg->hdr.flags.test_message == 1)
                        return false;
@@ -2048,9 +2048,9 @@ controlvm_periodic_work(struct work_struct *work)
        bool got_command = false;
        bool handle_command_failed = false;
 
-       while (visorchannel_signalremove(controlvm_channel,
-                                        CONTROLVM_QUEUE_RESPONSE,
-                                        &inmsg))
+       while (!visorchannel_signalremove(controlvm_channel,
+                                         CONTROLVM_QUEUE_RESPONSE,
+                                         &inmsg))
                ;
        if (!got_command) {
                if (controlvm_pending_msg_valid) {

diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c
index 887be22a6a60d4043ee8fff0b8c3d63db6c7c9cb..e968f33380dcd1628e4ed6d82548274aaa76fa0e 100644 (file)
--- a/drivers/staging/unisys/visorhba/visorhba_main.c
+++ b/drivers/staging/unisys/visorhba/visorhba_main.c
@@ -927,9 +927,9 @@ drain_queue(struct uiscmdrsp *cmdrsp, struct visorhba_devdata *devdata)
        struct scsi_cmnd *scsicmd;
 
        while (1) {
-               if (!visorchannel_signalremove(devdata->dev->visorchannel,
-                                              IOCHAN_FROM_IOPART,
-                                              cmdrsp))
+               if (visorchannel_signalremove(devdata->dev->visorchannel,
+                                             IOCHAN_FROM_IOPART,
+                                             cmdrsp))
                        break; /* queue empty */
 
                if (cmdrsp->cmdtype == CMD_SCSI_TYPE) {

diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c
index aa44414f4bce31f33949831151ac44b27eb998c9..6f94b646f7c58c45a5ca44bd3e68278d4e87f653 100644 (file)
--- a/drivers/staging/unisys/visorinput/visorinput.c
+++ b/drivers/staging/unisys/visorinput/visorinput.c
@@ -581,7 +581,7 @@ visorinput_channel_interrupt(struct visor_device *dev)
 
        visorinput_dev = devdata->visorinput_dev;
 
-       while (visorchannel_signalremove(dev->visorchannel, 0, &r)) {
+       while (!visorchannel_signalremove(dev->visorchannel, 0, &r)) {
                scancode = r.activity.arg1;
                keycode = scancode_to_keycode(scancode);
                switch (r.activity.action) {

diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index 2b3ba490abf2a8a3e481265e2fa82b6962c0c652..8e70b36f16f71c780db0516070dc9a1d15636211 100644 (file)
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -1539,9 +1539,9 @@ send_rcv_posts_if_needed(struct visornic_devdata *devdata)
 static void
 drain_resp_queue(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata)
 {
-       while (visorchannel_signalremove(devdata->dev->visorchannel,
-                                        IOCHAN_FROM_IOPART,
-                                        cmdrsp))
+       while (!visorchannel_signalremove(devdata->dev->visorchannel,
+                                         IOCHAN_FROM_IOPART,
+                                         cmdrsp))
                ;
 }
 
@@ -1565,9 +1565,9 @@ service_resp_queue(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata,
        /* TODO: CLIENT ACQUIRE -- Don't really need this at the
         * moment
         */
-               if (!visorchannel_signalremove(devdata->dev->visorchannel,
-                                              IOCHAN_FROM_IOPART,
-                                              cmdrsp))
+               if (visorchannel_signalremove(devdata->dev->visorchannel,
+                                             IOCHAN_FROM_IOPART,
+                                             cmdrsp))
                        break; /* queue empty */
 
                switch (cmdrsp->net.type) {