[PATCH 05/30] staging: unisys: fix function visorchannel_signalremove from bool to int

[Benjamin Romer]

From: Erik Arfvidson <erik.arfvid...@unisys.com>

this patch changes visorchannel_signalremove from bool to int. Also modified
signalremove_inner since the return value was bool and change it to int.

Signed-off-by: Erik Arfvidson <erik.arfvid...@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel.h     |  2 +-
 .../staging/unisys/visorchannel/visorchannel_funcs.c   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h 
b/drivers/staging/unisys/visorchannel/visorchannel.h
index 63f1b97..5b4ff15 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel.h
+++ b/drivers/staging/unisys/visorchannel/visorchannel.h
@@ -52,7 +52,7 @@ int visorchannel_write(struct visorchannel *channel, ulong 
offset,
                       void *local, ulong nbytes);
 int visorchannel_clear(struct visorchannel *channel, ulong offset,
                       u8 ch, ulong nbytes);
-BOOL visorchannel_signalremove(struct visorchannel *channel, u32 queue,
+int visorchannel_signalremove(struct visorchannel *channel, u32 queue,
                               void *msg);
 BOOL visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
                               void *msg);
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c 
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 0188ef8..68befd6 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -411,21 +411,21 @@ safe_sig_queue_validate(struct signal_queue_header 
*psafe_sqh,
        return 1;
 }                              /* end safe_sig_queue_validate */
 
-static BOOL
+static int
 signalremove_inner(struct visorchannel *channel, u32 queue, void *msg)
 {
        struct signal_queue_header sig_hdr;
 
        if (!sig_read_header(channel, queue, &sig_hdr)) {
-               return FALSE;
+               return 0;
        }
        if (sig_hdr.head == sig_hdr.tail)
-               return FALSE;   /* no signals to remove */
+               return 0;       /* no signals to remove */
 
        sig_hdr.tail = (sig_hdr.tail + 1) % sig_hdr.max_slots;
        if (!sig_read_data(channel, queue, &sig_hdr, sig_hdr.tail, msg)) {
                ERRDRV("sig_read_data failed\n");
-               return FALSE;
+               return 0;
        }
        sig_hdr.num_received++;
 
@@ -435,19 +435,19 @@ signalremove_inner(struct visorchannel *channel, u32 
queue, void *msg)
        mb(); /* required for channel synch */
        if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, tail)) {
                ERRDRV("visor_memregion_write of Tail failed\n");
-               return FALSE;
+               return 0;
        }
        if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_received)) {
                ERRDRV("visor_memregion_write of NumSignalsReceived failed\n");
-               return FALSE;
+               return 0;
        }
-       return TRUE;
+       return 1;
 }
 
-BOOL
+int
 visorchannel_signalremove(struct visorchannel *channel, u32 queue, void *msg)
 {
-       BOOL rc;
+       int rc;
 
        if (channel->needs_lock) {
                spin_lock(&channel->remove_lock);
-- 
2.1.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel