From: Erik Arfvidson <erik.arfvidson@xxxxxxxxxx>
this patch removes #definitions from timksmod.h
Signed-off-by: Erik Arfvidson <erik.arfvidson@xxxxxxxxxx>
Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx>
---
drivers/staging/unisys/include/timskmod.h | 5 -----
drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 15 +++++----------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index 4019a0d..bd36ef8 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -53,11 +53,6 @@
#include <linux/mm.h>
/* #define DEBUG */
-#ifndef BOOL
-#define BOOL int
-#endif
-#define FALSE 0
-#define TRUE 1
#if !defined SUCCESS
#define SUCCESS 0
#endif
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 8def9c2..4f25d9b 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -322,11 +322,9 @@ static int
sig_read_header(struct visorchannel *channel, u32 queue,
struct signal_queue_header *sig_hdr)
{
- int rc = 0;
-
if (channel->chan_hdr.ch_space_offset < sizeof(struct channel_header)) {
- ERRDRV("oChannelSpace too small: (status=%d)\n", rc);
- goto cleanup;
+ ERRDRV("oChannelSpace too small\n");
+ return 0;
}
/* Read the appropriate SIGNAL_QUEUE_HEADER into local memory. */
@@ -337,13 +335,10 @@ sig_read_header(struct visorchannel *channel, u32 queue,
sizeof(struct signal_queue_header)) < 0) {
ERRDRV("queue=%d SIG_QUEUE_OFFSET=%d",
queue, (int)SIG_QUEUE_OFFSET(&channel->chan_hdr, queue));
- ERRDRV("visor_memregion_read of signal queue failed: (status=%d)\n",
- rc);
- goto cleanup;
+ ERRDRV("visor_memregion_read of signal queue failed\n");
+ return 0;
}
- rc = 1;
-cleanup:
- return rc;
+ return 1;
}
static int
--
2.1.0
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
