[PATCH 20/30] staging: unisys: remove goto from sig_do_data()

[Benjamin Romer]

The gotos in this function are unnecessary, so just return.

Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
---
 drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c 
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 4f25d9b..73dd54b 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -346,28 +346,23 @@ sig_do_data(struct visorchannel *channel, u32 queue,
            struct signal_queue_header *sig_hdr, u32 slot, void *data,
            int is_write)
 {
-       int rc = 0;
        int signal_data_offset = SIG_DATA_OFFSET(&channel->chan_hdr, queue,
                                                 sig_hdr, slot);
        if (is_write) {
                if (visor_memregion_write(channel->memregion,
                                          signal_data_offset,
                                          data, sig_hdr->signal_size) < 0) {
-                       ERRDRV("visor_memregion_write of signal data failed: 
(status=%d)\n",
-                              rc);
-                       goto cleanup;
+                       ERRDRV("visor_memregion_write of signal data failed");
+                       return 0;
                }
        } else {
                if (visor_memregion_read(channel->memregion, signal_data_offset,
                                         data, sig_hdr->signal_size) < 0) {
-                       ERRDRV("visor_memregion_read of signal data failed: 
(status=%d)\n",
-                              rc);
-                       goto cleanup;
+                       ERRDRV("visor_memregion_read of signal data failed");
+                       return 0;
                }
        }
-       rc = 1;
-cleanup:
-       return rc;
+       return 0;
 }
 
 static inline int
-- 
2.1.0

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