Remove the do blocks around several macros and fix spacing and trailing
semicolons.
Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
---
.../unisys/common-spar/include/channels/iochannel.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h
b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
index ed66c27..a0c20e3 100644
--- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
@@ -374,7 +374,7 @@ struct uiscmdrsp_scsi {
* NOTE:[4] SCSI returns (n-4); so we return length-1-4 or length-5. */
#define SET_NO_DISK_INQUIRY_RESULT(buf, len, lun, lun0notpresent, notpresent) \
- do { \
+ { \
memset(buf, 0, \
MINNUM(len, \
(unsigned int) NO_DISK_INQUIRY_RESULT_LEN)); \
@@ -386,7 +386,7 @@ struct uiscmdrsp_scsi {
buf[0] = (u8) notpresent; \
buf[4] = (u8) ( \
MINNUM(len, \
- (unsigned int) NO_DISK_INQUIRY_RESULT_LEN) - 5);
\
+ (unsigned int) NO_DISK_INQUIRY_RESULT_LEN) - 5);\
if (len >= NO_DISK_INQUIRY_RESULT_LEN) { \
buf[8] = 'D'; \
buf[9] = 'E'; \
@@ -408,7 +408,7 @@ struct uiscmdrsp_scsi {
buf[30] = ' '; \
buf[31] = '.'; \
} \
- } while (0)
+ }
/*
@@ -749,7 +749,7 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
#define QSLOTSFROMBYTES(bytes) (((bytes-SIZEOF_PROTOCOL)/2)/SIZEOF_CMDRSP)
#define QSIZEFROMBYTES(bytes) (QSLOTSFROMBYTES(bytes)*SIZEOF_CMDRSP)
#define SignalQInit(x) \
- do { \
+ { \
x->cmdQ.Size = QSIZEFROMBYTES(x->ChannelHeader.Size); \
x->cmdQ.oSignalBase = SIZEOF_PROTOCOL - \
offsetof(ULTRA_IO_CHANNEL_PROTOCOL, cmdQ); \
@@ -767,10 +767,10 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
x->rspQ.MaxSignals = x->rspQ.MaxSignalSlots - 1; \
x->ChannelHeader.oChannelSpace = \
offsetof(ULTRA_IO_CHANNEL_PROTOCOL, cmdQ); \
- } while (0)
+ }
#define INIT_CLIENTSTRING(chan, type, clientStr, clientStrLen) \
- do { \
+ { \
if (clientStr) { \
chan->ChannelHeader.oClientString = \
offsetof(type, clientString); \
@@ -785,16 +785,16 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
else \
if (clientStrLen > 0) \
return 0; \
- } while (0)
+ }
#define ULTRA_IO_CHANNEL_SERVER_READY(x, chanId, logCtx) \
ULTRA_CHANNEL_SERVER_TRANSITION(x, chanId, SrvState, CHANNELSRV_READY, \
- logCtx);
+ logCtx)
#define ULTRA_IO_CHANNEL_SERVER_NOTREADY(x, chanId, logCtx) \
ULTRA_CHANNEL_SERVER_TRANSITION(x, chanId, SrvState, \
- CHANNELSRV_UNINITIALIZED, logCtx);
+ CHANNELSRV_UNINITIALIZED, logCtx)
static inline int ULTRA_VHBA_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
struct vhba_wwnn *wwnn,
--
1.9.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
