wireless: Remove unnecessary ; from while (0) macros
Semicolons are not necessary after macros that end in while (0). Remove them. Simplify the macros with tests of do { if (foo>size) memset1; else memset2;} while (0); to a single line memset(,,min_t(size_t, foo, size)) Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Arend van Spriel <arend@broadcom.com> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Acked-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
150721894e
commit
da951c2417
@@ -530,12 +530,7 @@
|
||||
SET_BITS_OFFSET_LE(__pdesc+28, 0, 32, __val)
|
||||
|
||||
#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size) \
|
||||
do { \
|
||||
if (_size > TX_DESC_NEXT_DESC_OFFSET) \
|
||||
memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET); \
|
||||
else \
|
||||
memset(__pdesc, 0, _size); \
|
||||
} while (0);
|
||||
memset(__pdesc, 0, min_t(size_t, _size, TX_DESC_NEXT_DESC_OFFSET))
|
||||
|
||||
struct rx_fwinfo_92c {
|
||||
u8 gain_trsw[4];
|
||||
|
@@ -530,12 +530,8 @@
|
||||
SET_BITS_OFFSET_LE(__pdesc+28, 0, 32, __val)
|
||||
|
||||
#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size) \
|
||||
do { \
|
||||
if (_size > TX_DESC_NEXT_DESC_OFFSET) \
|
||||
memset((void *)__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET); \
|
||||
else \
|
||||
memset((void *)__pdesc, 0, _size); \
|
||||
} while (0);
|
||||
memset((void *)__pdesc, 0, \
|
||||
min_t(size_t, _size, TX_DESC_NEXT_DESC_OFFSET))
|
||||
|
||||
/* For 92D early mode */
|
||||
#define SET_EARLYMODE_PKTNUM(__paddr, __value) \
|
||||
|
@@ -252,12 +252,7 @@
|
||||
* the desc is cleared. */
|
||||
#define TX_DESC_NEXT_DESC_OFFSET 36
|
||||
#define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size) \
|
||||
do { \
|
||||
if (_size > TX_DESC_NEXT_DESC_OFFSET) \
|
||||
memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET); \
|
||||
else \
|
||||
memset(__pdesc, 0, _size); \
|
||||
} while (0);
|
||||
memset(__pdesc, 0, min_t(size_t, _size, TX_DESC_NEXT_DESC_OFFSET))
|
||||
|
||||
/* Rx Desc */
|
||||
#define RX_STATUS_DESC_SIZE 24
|
||||
|
@@ -345,7 +345,7 @@ enum fw_h2c_cmd {
|
||||
do { \
|
||||
udelay(1000); \
|
||||
rtlpriv->rtlhal.fwcmd_iomap &= (~_Bit); \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
#define FW_CMD_IO_UPDATE(rtlpriv, _val) \
|
||||
rtlpriv->rtlhal.fwcmd_iomap = _val;
|
||||
@@ -354,13 +354,13 @@ enum fw_h2c_cmd {
|
||||
do { \
|
||||
rtl_write_word(rtlpriv, LBUS_MON_ADDR, (u16)_val); \
|
||||
FW_CMD_IO_UPDATE(rtlpriv, _val); \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
#define FW_CMD_PARA_SET(rtlpriv, _val) \
|
||||
do { \
|
||||
rtl_write_dword(rtlpriv, LBUS_ADDR_MASK, _val); \
|
||||
rtlpriv->rtlhal.fwcmd_ioparam = _val; \
|
||||
} while (0);
|
||||
} while (0)
|
||||
|
||||
#define FW_CMD_IO_QUERY(rtlpriv) \
|
||||
(u16)(rtlpriv->rtlhal.fwcmd_iomap)
|
||||
|
Reference in New Issue
Block a user