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 <[email protected]>
---
drivers/net/wireless/ath/carl9170/cmd.h | 6 +++---
drivers/net/wireless/brcm80211/brcmsmac/d11.h | 2 +-
drivers/net/wireless/mwifiex/sdio.h | 8 ++++----
drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 7 +------
drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 8 ++------
drivers/net/wireless/rtlwifi/rtl8192se/def.h | 7 +------
drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 6 +++---
7 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/drivers/net/wireless/ath/carl9170/cmd.h b/drivers/net/wireless/ath/carl9170/cmd.h
index 885c427..65919c9 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.h
+++ b/drivers/net/wireless/ath/carl9170/cmd.h
@@ -114,7 +114,7 @@ __regwrite_out : \
#define carl9170_regwrite_result() \
__err; \
-} while (0);
+} while (0)
#define carl9170_async_regwrite_get_buf() \
@@ -126,7 +126,7 @@ do { \
__err = -ENOMEM; \
goto __async_regwrite_out; \
} \
-} while (0);
+} while (0)
#define carl9170_async_regwrite_begin(carl) \
do { \
@@ -169,6 +169,6 @@ __async_regwrite_out: \
#define carl9170_async_regwrite_result() \
__err; \
-} while (0);
+} while (0)
#endif /* __CMD_H */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
index 1948cb2..3f659e0 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/d11.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
@@ -733,7 +733,7 @@ struct cck_phy_hdr {
do { \
plcp[1] = len & 0xff; \
plcp[2] = ((len >> 8) & 0xff); \
- } while (0);
+ } while (0)
#define BRCMS_SET_MIMO_PLCP_AMPDU(plcp) (plcp[3] |= MIMO_PLCP_AMPDU)
#define BRCMS_CLR_MIMO_PLCP_AMPDU(plcp) (plcp[3] &= ~MIMO_PLCP_AMPDU)
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index a3fb322..0ead152 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -193,7 +193,7 @@
a->mpa_tx.ports |= (1<<(a->mpa_tx.pkt_cnt+1+(MAX_PORT - \
a->mp_end_port))); \
a->mpa_tx.pkt_cnt++; \
-} while (0);
+} while (0)
/* SDIO Tx aggregation limit ? */
#define MP_TX_AGGR_PKT_LIMIT_REACHED(a) \
@@ -211,7 +211,7 @@
a->mpa_tx.buf_len = 0; \
a->mpa_tx.ports = 0; \
a->mpa_tx.start_port = 0; \
-} while (0);
+} while (0)
/* SDIO Rx aggregation limit ? */
#define MP_RX_AGGR_PKT_LIMIT_REACHED(a) \
@@ -242,7 +242,7 @@
a->mpa_rx.skb_arr[a->mpa_rx.pkt_cnt] = skb; \
a->mpa_rx.len_arr[a->mpa_rx.pkt_cnt] = skb->len; \
a->mpa_rx.pkt_cnt++; \
-} while (0);
+} while (0)
/* Reset SDIO Rx aggregation buffer parameters */
#define MP_RX_AGGR_BUF_RESET(a) do { \
@@ -250,7 +250,7 @@
a->mpa_rx.buf_len = 0; \
a->mpa_rx.ports = 0; \
a->mpa_rx.start_port = 0; \
-} while (0);
+} while (0)
/* data structure for SDIO MPA TX */
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
index efb9ab2..c4adb97 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
@@ -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];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
index 0dc736c..057a524 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
@@ -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) \
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
index d1b0a1e..20afec6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
index b4afff6..d53f433 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
@@ -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)
On 04/03/2012 11:46 PM, Joe Perches wrote:
> 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))
>
Acked-by: Arend van Spriel <[email protected]>
> Signed-off-by: Joe Perches<[email protected]>
> ---
> drivers/net/wireless/ath/carl9170/cmd.h | 6 +++---
> drivers/net/wireless/brcm80211/brcmsmac/d11.h | 2 +-
> drivers/net/wireless/mwifiex/sdio.h | 8 ++++----
> drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 7 +------
> drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 8 ++------
> drivers/net/wireless/rtlwifi/rtl8192se/def.h | 7 +------
> drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 6 +++---
> 7 files changed, 15 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/carl9170/cmd.h b/drivers/net/wireless/ath/carl9170/cmd.h
> index 885c427..65919c9 100644
> --- a/drivers/net/wireless/ath/carl9170/cmd.h
> +++ b/drivers/net/wireless/ath/carl9170/cmd.h
> @@ -114,7 +114,7 @@ __regwrite_out : \
>
> #define carl9170_regwrite_result() \
> __err; \
> -} while (0);
> +} while (0)
>
>
> #define carl9170_async_regwrite_get_buf() \
> @@ -126,7 +126,7 @@ do { \
> __err = -ENOMEM; \
> goto __async_regwrite_out; \
> } \
> -} while (0);
> +} while (0)
>
> #define carl9170_async_regwrite_begin(carl) \
> do { \
> @@ -169,6 +169,6 @@ __async_regwrite_out: \
>
> #define carl9170_async_regwrite_result() \
> __err; \
> -} while (0);
> +} while (0)
>
> #endif /* __CMD_H */
> diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
> index 1948cb2..3f659e0 100644
> --- a/drivers/net/wireless/brcm80211/brcmsmac/d11.h
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
> @@ -733,7 +733,7 @@ struct cck_phy_hdr {
> do { \
> plcp[1] = len& 0xff; \
> plcp[2] = ((len>> 8)& 0xff); \
> - } while (0);
> + } while (0)
>
> #define BRCMS_SET_MIMO_PLCP_AMPDU(plcp) (plcp[3] |= MIMO_PLCP_AMPDU)
> #define BRCMS_CLR_MIMO_PLCP_AMPDU(plcp) (plcp[3]&= ~MIMO_PLCP_AMPDU)
> diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
> index a3fb322..0ead152 100644
> --- a/drivers/net/wireless/mwifiex/sdio.h
> +++ b/drivers/net/wireless/mwifiex/sdio.h
> @@ -193,7 +193,7 @@
> a->mpa_tx.ports |= (1<<(a->mpa_tx.pkt_cnt+1+(MAX_PORT - \
> a->mp_end_port))); \
> a->mpa_tx.pkt_cnt++; \
> -} while (0);
> +} while (0)
>
> /* SDIO Tx aggregation limit ? */
> #define MP_TX_AGGR_PKT_LIMIT_REACHED(a) \
> @@ -211,7 +211,7 @@
> a->mpa_tx.buf_len = 0; \
> a->mpa_tx.ports = 0; \
> a->mpa_tx.start_port = 0; \
> -} while (0);
> +} while (0)
>
> /* SDIO Rx aggregation limit ? */
> #define MP_RX_AGGR_PKT_LIMIT_REACHED(a) \
> @@ -242,7 +242,7 @@
> a->mpa_rx.skb_arr[a->mpa_rx.pkt_cnt] = skb; \
> a->mpa_rx.len_arr[a->mpa_rx.pkt_cnt] = skb->len; \
> a->mpa_rx.pkt_cnt++; \
> -} while (0);
> +} while (0)
>
> /* Reset SDIO Rx aggregation buffer parameters */
> #define MP_RX_AGGR_BUF_RESET(a) do { \
> @@ -250,7 +250,7 @@
> a->mpa_rx.buf_len = 0; \
> a->mpa_rx.ports = 0; \
> a->mpa_rx.start_port = 0; \
> -} while (0);
> +} while (0)
>
>
> /* data structure for SDIO MPA TX */
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
> index efb9ab2..c4adb97 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
> @@ -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];
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
> index 0dc736c..057a524 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
> @@ -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) \
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
> index d1b0a1e..20afec6 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
> @@ -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
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> index b4afff6..d53f433 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> @@ -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)
>
>
>
PiBTZW1pY29sb25zIGFyZSBub3QgbmVjZXNzYXJ5IGFmdGVyIG1hY3JvcyB0aGF0IGVuZCBpbiB3
aGlsZSAoMCkuDQo+IFJlbW92ZSB0aGVtLg0KPiANCj4gU2ltcGxpZnkgdGhlIG1hY3JvcyB3aXRo
IHRlc3RzIG9mDQo+IGRvIHsgaWYgKGZvbz5zaXplKSBtZW1zZXQxOyBlbHNlIG1lbXNldDI7fSB3
aGlsZSAoMCk7DQo+IHRvIGEgc2luZ2xlIGxpbmUgbWVtc2V0KCwsbWluX3Qoc2l6ZV90LCBmb28s
IHNpemUpKQ0KPiANCj4gU2lnbmVkLW9mZi1ieTogSm9lIFBlcmNoZXMgPGpvZUBwZXJjaGVzLmNv
bT4NCj4gLS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvY2FybDkxNzAvY21kLmggICAg
ICAgfCAgICA2ICsrKy0tLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvYnJjbTgwMjExL2JyY21z
bWFjL2QxMS5oIHwgICAgMiArLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvbXdpZmlleC9zZGlv
LmggICAgICAgICAgIHwgICAgOCArKysrLS0tLQ0KDQpGb3IgbXdpZmlleCBwYXJ0LA0KQWNrZWQt
Ynk6IEJpbmcgWmhhbyA8YnpoYW9AbWFydmVsbC5jb20+DQoNClRoYW5rcywNCkJpbmcNCg0KPiAg
ZHJpdmVycy9uZXQvd2lyZWxlc3MvcnRsd2lmaS9ydGw4MTkyY2UvdHJ4LmggIHwgICAgNyArLS0t
LS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9ydGx3aWZpL3J0bDgxOTJkZS90cnguaCAgfCAg
ICA4ICsrLS0tLS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9ydGx3aWZpL3J0bDgxOTJzZS9k
ZWYuaCAgfCAgICA3ICstLS0tLS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL3J0bHdpZmkvcnRs
ODE5MnNlL2Z3LmggICB8ICAgIDYgKysrLS0tDQo+ICA3IGZpbGVzIGNoYW5nZWQsIDE1IGluc2Vy
dGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0
L3dpcmVsZXNzL2F0aC9jYXJsOTE3MC9jbWQuaCBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9j
YXJsOTE3MC9jbWQuaA0KPiBpbmRleCA4ODVjNDI3Li42NTkxOWM5IDEwMDY0NA0KPiAtLS0gYS9k
cml2ZXJzL25ldC93aXJlbGVzcy9hdGgvY2FybDkxNzAvY21kLmgNCj4gKysrIGIvZHJpdmVycy9u
ZXQvd2lyZWxlc3MvYXRoL2Nhcmw5MTcwL2NtZC5oDQo+IEBAIC0xMTQsNyArMTE0LDcgQEAgX19y
ZWd3cml0ZV9vdXQgOgkJCQkJCQlcDQo+IA0KPiAgI2RlZmluZSBjYXJsOTE3MF9yZWd3cml0ZV9y
ZXN1bHQoKQkJCQkJXA0KPiAgCV9fZXJyOwkJCQkJCQkJXA0KPiAtfSB3aGlsZSAoMCk7DQo+ICt9
IHdoaWxlICgwKQ0KPiANCj4gDQo+ICAjZGVmaW5lIGNhcmw5MTcwX2FzeW5jX3JlZ3dyaXRlX2dl
dF9idWYoKQkJCQlcDQo+IEBAIC0xMjYsNyArMTI2LDcgQEAgZG8gewkJCQkJCQkJCVwNCj4gIAkJ
X19lcnIgPSAtRU5PTUVNOwkJCQkJXA0KPiAgCQlnb3RvIF9fYXN5bmNfcmVnd3JpdGVfb3V0OwkJ
CQlcDQo+ICAJfQkJCQkJCQkJXA0KPiAtfSB3aGlsZSAoMCk7DQo+ICt9IHdoaWxlICgwKQ0KPiAN
Cj4gICNkZWZpbmUgY2FybDkxNzBfYXN5bmNfcmVnd3JpdGVfYmVnaW4oY2FybCkJCQkJXA0KPiAg
ZG8gewkJCQkJCQkJCVwNCj4gQEAgLTE2OSw2ICsxNjksNiBAQCBfX2FzeW5jX3JlZ3dyaXRlX291
dDoJCQkJCQkJXA0KPiANCj4gICNkZWZpbmUgY2FybDkxNzBfYXN5bmNfcmVnd3JpdGVfcmVzdWx0
KCkJCQkJXA0KPiAgCV9fZXJyOwkJCQkJCQkJXA0KPiAtfSB3aGlsZSAoMCk7DQo+ICt9IHdoaWxl
ICgwKQ0KPiANCj4gICNlbmRpZiAvKiBfX0NNRF9IICovDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz
L25ldC93aXJlbGVzcy9icmNtODAyMTEvYnJjbXNtYWMvZDExLmgNCj4gYi9kcml2ZXJzL25ldC93
aXJlbGVzcy9icmNtODAyMTEvYnJjbXNtYWMvZDExLmgNCj4gaW5kZXggMTk0OGNiMi4uM2Y2NTll
MCAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvYnJjbTgwMjExL2JyY21zbWFj
L2QxMS5oDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2JyY204MDIxMS9icmNtc21hYy9k
MTEuaA0KPiBAQCAtNzMzLDcgKzczMyw3IEBAIHN0cnVjdCBjY2tfcGh5X2hkciB7DQo+ICAJZG8g
eyBcDQo+ICAJCXBsY3BbMV0gPSBsZW4gJiAweGZmOyBcDQo+ICAJCXBsY3BbMl0gPSAoKGxlbiA+
PiA4KSAmIDB4ZmYpOyBcDQo+IC0JfSB3aGlsZSAoMCk7DQo+ICsJfSB3aGlsZSAoMCkNCj4gDQo+
ICAjZGVmaW5lIEJSQ01TX1NFVF9NSU1PX1BMQ1BfQU1QRFUocGxjcCkgKHBsY3BbM10gfD0gTUlN
T19QTENQX0FNUERVKQ0KPiAgI2RlZmluZSBCUkNNU19DTFJfTUlNT19QTENQX0FNUERVKHBsY3Ap
IChwbGNwWzNdICY9IH5NSU1PX1BMQ1BfQU1QRFUpDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25l
dC93aXJlbGVzcy9td2lmaWV4L3NkaW8uaCBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL213aWZpZXgv
c2Rpby5oDQo+IGluZGV4IGEzZmIzMjIuLjBlYWQxNTIgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMv
bmV0L3dpcmVsZXNzL213aWZpZXgvc2Rpby5oDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNz
L213aWZpZXgvc2Rpby5oDQo+IEBAIC0xOTMsNyArMTkzLDcgQEANCj4gIAkJYS0+bXBhX3R4LnBv
cnRzIHw9ICgxPDwoYS0+bXBhX3R4LnBrdF9jbnQrMSsoTUFYX1BPUlQgLQlcDQo+ICAJCQkJCQlh
LT5tcF9lbmRfcG9ydCkpKTsJXA0KPiAgCWEtPm1wYV90eC5wa3RfY250Kys7CQkJCQkJXA0KPiAt
fSB3aGlsZSAoMCk7DQo+ICt9IHdoaWxlICgwKQ0KPiANCj4gIC8qIFNESU8gVHggYWdncmVnYXRp
b24gbGltaXQgPyAqLw0KPiAgI2RlZmluZSBNUF9UWF9BR0dSX1BLVF9MSU1JVF9SRUFDSEVEKGEp
CQkJCQlcDQo+IEBAIC0yMTEsNyArMjExLDcgQEANCj4gIAlhLT5tcGFfdHguYnVmX2xlbiA9IDA7
CQkJCQkJXA0KPiAgCWEtPm1wYV90eC5wb3J0cyA9IDA7CQkJCQkJXA0KPiAgCWEtPm1wYV90eC5z
dGFydF9wb3J0ID0gMDsJCQkJCVwNCj4gLX0gd2hpbGUgKDApOw0KPiArfSB3aGlsZSAoMCkNCj4g
DQo+ICAvKiBTRElPIFJ4IGFnZ3JlZ2F0aW9uIGxpbWl0ID8gKi8NCj4gICNkZWZpbmUgTVBfUlhf
QUdHUl9QS1RfTElNSVRfUkVBQ0hFRChhKQkJCQkJXA0KPiBAQCAtMjQyLDcgKzI0Miw3IEBADQo+
ICAJYS0+bXBhX3J4LnNrYl9hcnJbYS0+bXBhX3J4LnBrdF9jbnRdID0gc2tiOwkJCVwNCj4gIAlh
LT5tcGFfcngubGVuX2FyclthLT5tcGFfcngucGt0X2NudF0gPSBza2ItPmxlbjsJCVwNCj4gIAlh
LT5tcGFfcngucGt0X2NudCsrOwkJCQkJCVwNCj4gLX0gd2hpbGUgKDApOw0KPiArfSB3aGlsZSAo
MCkNCj4gDQo+ICAvKiBSZXNldCBTRElPIFJ4IGFnZ3JlZ2F0aW9uIGJ1ZmZlciBwYXJhbWV0ZXJz
ICovDQo+ICAjZGVmaW5lIE1QX1JYX0FHR1JfQlVGX1JFU0VUKGEpIGRvIHsJCQkJCVwNCj4gQEAg
LTI1MCw3ICsyNTAsNyBAQA0KPiAgCWEtPm1wYV9yeC5idWZfbGVuID0gMDsJCQkJCQlcDQo+ICAJ
YS0+bXBhX3J4LnBvcnRzID0gMDsJCQkJCQlcDQo+ICAJYS0+bXBhX3J4LnN0YXJ0X3BvcnQgPSAw
OwkJCQkJXA0KPiAtfSB3aGlsZSAoMCk7DQo+ICt9IHdoaWxlICgwKQ0KPiANCj4gDQo+ICAvKiBk
YXRhIHN0cnVjdHVyZSBmb3IgU0RJTyBNUEEgVFggKi8NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv
bmV0L3dpcmVsZXNzL3J0bHdpZmkvcnRsODE5MmNlL3RyeC5oDQo+IGIvZHJpdmVycy9uZXQvd2ly
ZWxlc3MvcnRsd2lmaS9ydGw4MTkyY2UvdHJ4LmgNCj4gaW5kZXggZWZiOWFiMi4uYzRhZGI5NyAx
MDA2NDQNCj4gLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvcnRsd2lmaS9ydGw4MTkyY2UvdHJ4
LmgNCj4gKysrIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvcnRsd2lmaS9ydGw4MTkyY2UvdHJ4LmgN
Cj4gQEAgLTUzMCwxMiArNTMwLDcgQEANCj4gIAlTRVRfQklUU19PRkZTRVRfTEUoX19wZGVzYysy
OCwgMCwgMzIsIF9fdmFsKQ0KPiANCj4gICNkZWZpbmUgQ0xFQVJfUENJX1RYX0RFU0NfQ09OVEVO
VChfX3BkZXNjLCBfc2l6ZSkJXA0KPiAtZG8gewkJCQkJCQlcDQo+IC0JaWYgKF9zaXplID4gVFhf
REVTQ19ORVhUX0RFU0NfT0ZGU0VUKQkJXA0KPiAtCQltZW1zZXQoX19wZGVzYywgMCwgVFhfREVT
Q19ORVhUX0RFU0NfT0ZGU0VUKTsJXA0KPiAtCWVsc2UJCQkJCQlcDQo+IC0JCW1lbXNldChfX3Bk
ZXNjLCAwLCBfc2l6ZSk7CVwNCj4gLX0gd2hpbGUgKDApOw0KPiArCW1lbXNldChfX3BkZXNjLCAw
LCBtaW5fdChzaXplX3QsIF9zaXplLCBUWF9ERVNDX05FWFRfREVTQ19PRkZTRVQpKQ0KPiANCj4g
IHN0cnVjdCByeF9md2luZm9fOTJjIHsNCj4gIAl1OCBnYWluX3Ryc3dbNF07DQo+IGRpZmYgLS1n
aXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9ydGx3aWZpL3J0bDgxOTJkZS90cnguaA0KPiBiL2Ry
aXZlcnMvbmV0L3dpcmVsZXNzL3J0bHdpZmkvcnRsODE5MmRlL3RyeC5oDQo+IGluZGV4IDBkYzcz
NmMuLjA1N2E1MjQgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3J0bHdpZmkv
cnRsODE5MmRlL3RyeC5oDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3J0bHdpZmkvcnRs
ODE5MmRlL3RyeC5oDQo+IEBAIC01MzAsMTIgKzUzMCw4IEBADQo+ICAJU0VUX0JJVFNfT0ZGU0VU
X0xFKF9fcGRlc2MrMjgsIDAsIDMyLCBfX3ZhbCkNCj4gDQo+ICAjZGVmaW5lIENMRUFSX1BDSV9U
WF9ERVNDX0NPTlRFTlQoX19wZGVzYywgX3NpemUpCVwNCj4gLWRvIHsJCQkJCQkJXA0KPiAtCWlm
IChfc2l6ZSA+IFRYX0RFU0NfTkVYVF9ERVNDX09GRlNFVCkJCVwNCj4gLQkJbWVtc2V0KCh2b2lk
ICopX19wZGVzYywgMCwgVFhfREVTQ19ORVhUX0RFU0NfT0ZGU0VUKTsJXA0KPiAtCWVsc2UJCQkJ
CQlcDQo+IC0JCW1lbXNldCgodm9pZCAqKV9fcGRlc2MsIDAsIF9zaXplKTsJXA0KPiAtfSB3aGls
ZSAoMCk7DQo+ICsJbWVtc2V0KCh2b2lkICopX19wZGVzYywgMCwJCQlcDQo+ICsJICAgICAgIG1p
bl90KHNpemVfdCwgX3NpemUsIFRYX0RFU0NfTkVYVF9ERVNDX09GRlNFVCkpDQo+IA0KPiAgLyog
Rm9yIDkyRCBlYXJseSBtb2RlICovDQo+ICAjZGVmaW5lIFNFVF9FQVJMWU1PREVfUEtUTlVNKF9f
cGFkZHIsIF9fdmFsdWUpCQlcDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9y
dGx3aWZpL3J0bDgxOTJzZS9kZWYuaA0KPiBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3J0bHdpZmkv
cnRsODE5MnNlL2RlZi5oDQo+IGluZGV4IGQxYjBhMWUuLjIwYWZlYzYgMTAwNjQ0DQo+IC0tLSBh
L2RyaXZlcnMvbmV0L3dpcmVsZXNzL3J0bHdpZmkvcnRsODE5MnNlL2RlZi5oDQo+ICsrKyBiL2Ry
aXZlcnMvbmV0L3dpcmVsZXNzL3J0bHdpZmkvcnRsODE5MnNlL2RlZi5oDQo+IEBAIC0yNTIsMTIg
KzI1Miw3IEBADQo+ICAgKiB0aGUgZGVzYyBpcyBjbGVhcmVkLiAqLw0KPiAgI2RlZmluZQlUWF9E
RVNDX05FWFRfREVTQ19PRkZTRVQJCQkzNg0KPiAgI2RlZmluZSBDTEVBUl9QQ0lfVFhfREVTQ19D
T05URU5UKF9fcGRlc2MsIF9zaXplKQkJXA0KPiAtZG8gewkJCQkJCQkJXA0KPiAtCWlmIChfc2l6
ZSA+IFRYX0RFU0NfTkVYVF9ERVNDX09GRlNFVCkJCQlcDQo+IC0JCW1lbXNldChfX3BkZXNjLCAw
LCBUWF9ERVNDX05FWFRfREVTQ19PRkZTRVQpOwlcDQo+IC0JZWxzZQkJCQkJCQlcDQo+IC0JCW1l
bXNldChfX3BkZXNjLCAwLCBfc2l6ZSk7CQkJXA0KPiAtfSB3aGlsZSAoMCk7DQo+ICsJbWVtc2V0
KF9fcGRlc2MsIDAsIG1pbl90KHNpemVfdCwgX3NpemUsIFRYX0RFU0NfTkVYVF9ERVNDX09GRlNF
VCkpDQo+IA0KPiAgLyogUnggRGVzYyAqLw0KPiAgI2RlZmluZSBSWF9TVEFUVVNfREVTQ19TSVpF
CQkJCTI0DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9ydGx3aWZpL3J0bDgx
OTJzZS9mdy5oDQo+IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvcnRsd2lmaS9ydGw4MTkyc2UvZncu
aA0KPiBpbmRleCBiNGFmZmY2Li5kNTNmNDMzIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL25ldC93
aXJlbGVzcy9ydGx3aWZpL3J0bDgxOTJzZS9mdy5oDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVs
ZXNzL3J0bHdpZmkvcnRsODE5MnNlL2Z3LmgNCj4gQEAgLTM0NSw3ICszNDUsNyBAQCBlbnVtIGZ3
X2gyY19jbWQgew0KPiAgCWRvIHsJCQkJCQkJXA0KPiAgCQl1ZGVsYXkoMTAwMCk7CQkJCQlcDQo+
ICAJCXJ0bHByaXYtPnJ0bGhhbC5md2NtZF9pb21hcCAmPSAofl9CaXQpOwkJXA0KPiAtCX0gd2hp
bGUgKDApOw0KPiArCX0gd2hpbGUgKDApDQo+IA0KPiAgI2RlZmluZSBGV19DTURfSU9fVVBEQVRF
KHJ0bHByaXYsIF92YWwpCQkJCVwNCj4gIAlydGxwcml2LT5ydGxoYWwuZndjbWRfaW9tYXAgPSBf
dmFsOw0KPiBAQCAtMzU0LDEzICszNTQsMTMgQEAgZW51bSBmd19oMmNfY21kIHsNCj4gIAlkbyB7
CQkJCQkJCVwNCj4gIAkJcnRsX3dyaXRlX3dvcmQocnRscHJpdiwgTEJVU19NT05fQUREUiwgKHUx
NilfdmFsKTsJXA0KPiAgCQlGV19DTURfSU9fVVBEQVRFKHJ0bHByaXYsIF92YWwpOwkJXA0KPiAt
CX0gd2hpbGUgKDApOw0KPiArCX0gd2hpbGUgKDApDQo+IA0KPiAgI2RlZmluZSBGV19DTURfUEFS
QV9TRVQocnRscHJpdiwgX3ZhbCkJCQkJXA0KPiAgCWRvIHsJCQkJCQkJXA0KPiAgCQlydGxfd3Jp
dGVfZHdvcmQocnRscHJpdiwgTEJVU19BRERSX01BU0ssIF92YWwpOwlcDQo+ICAJCXJ0bHByaXYt
PnJ0bGhhbC5md2NtZF9pb3BhcmFtID0gX3ZhbDsJCVwNCj4gLQl9IHdoaWxlICgwKTsNCj4gKwl9
IHdoaWxlICgwKQ0KPiANCj4gICNkZWZpbmUgRldfQ01EX0lPX1FVRVJZKHJ0bHByaXYpCQkJCVwN
Cj4gIAkodTE2KShydGxwcml2LT5ydGxoYWwuZndjbWRfaW9tYXApDQo+IA0KDQo=
On 04/03/2012 04:46 PM, Joe Perches wrote:
> 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<[email protected]>
ACKed-by: Larry Finger <[email protected]> (rtlwifi part)
> ---
> drivers/net/wireless/ath/carl9170/cmd.h | 6 +++---
> drivers/net/wireless/brcm80211/brcmsmac/d11.h | 2 +-
> drivers/net/wireless/mwifiex/sdio.h | 8 ++++----
> drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 7 +------
> drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 8 ++------
> drivers/net/wireless/rtlwifi/rtl8192se/def.h | 7 +------
> drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 6 +++---
> 7 files changed, 15 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/carl9170/cmd.h b/drivers/net/wireless/ath/carl9170/cmd.h
> index 885c427..65919c9 100644
> --- a/drivers/net/wireless/ath/carl9170/cmd.h
> +++ b/drivers/net/wireless/ath/carl9170/cmd.h
> @@ -114,7 +114,7 @@ __regwrite_out : \
>
> #define carl9170_regwrite_result() \
> __err; \
> -} while (0);
> +} while (0)
>
>
> #define carl9170_async_regwrite_get_buf() \
> @@ -126,7 +126,7 @@ do { \
> __err = -ENOMEM; \
> goto __async_regwrite_out; \
> } \
> -} while (0);
> +} while (0)
>
> #define carl9170_async_regwrite_begin(carl) \
> do { \
> @@ -169,6 +169,6 @@ __async_regwrite_out: \
>
> #define carl9170_async_regwrite_result() \
> __err; \
> -} while (0);
> +} while (0)
>
> #endif /* __CMD_H */
> diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
> index 1948cb2..3f659e0 100644
> --- a/drivers/net/wireless/brcm80211/brcmsmac/d11.h
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/d11.h
> @@ -733,7 +733,7 @@ struct cck_phy_hdr {
> do { \
> plcp[1] = len& 0xff; \
> plcp[2] = ((len>> 8)& 0xff); \
> - } while (0);
> + } while (0)
>
> #define BRCMS_SET_MIMO_PLCP_AMPDU(plcp) (plcp[3] |= MIMO_PLCP_AMPDU)
> #define BRCMS_CLR_MIMO_PLCP_AMPDU(plcp) (plcp[3]&= ~MIMO_PLCP_AMPDU)
> diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
> index a3fb322..0ead152 100644
> --- a/drivers/net/wireless/mwifiex/sdio.h
> +++ b/drivers/net/wireless/mwifiex/sdio.h
> @@ -193,7 +193,7 @@
> a->mpa_tx.ports |= (1<<(a->mpa_tx.pkt_cnt+1+(MAX_PORT - \
> a->mp_end_port))); \
> a->mpa_tx.pkt_cnt++; \
> -} while (0);
> +} while (0)
>
> /* SDIO Tx aggregation limit ? */
> #define MP_TX_AGGR_PKT_LIMIT_REACHED(a) \
> @@ -211,7 +211,7 @@
> a->mpa_tx.buf_len = 0; \
> a->mpa_tx.ports = 0; \
> a->mpa_tx.start_port = 0; \
> -} while (0);
> +} while (0)
>
> /* SDIO Rx aggregation limit ? */
> #define MP_RX_AGGR_PKT_LIMIT_REACHED(a) \
> @@ -242,7 +242,7 @@
> a->mpa_rx.skb_arr[a->mpa_rx.pkt_cnt] = skb; \
> a->mpa_rx.len_arr[a->mpa_rx.pkt_cnt] = skb->len; \
> a->mpa_rx.pkt_cnt++; \
> -} while (0);
> +} while (0)
>
> /* Reset SDIO Rx aggregation buffer parameters */
> #define MP_RX_AGGR_BUF_RESET(a) do { \
> @@ -250,7 +250,7 @@
> a->mpa_rx.buf_len = 0; \
> a->mpa_rx.ports = 0; \
> a->mpa_rx.start_port = 0; \
> -} while (0);
> +} while (0)
>
>
> /* data structure for SDIO MPA TX */
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
> index efb9ab2..c4adb97 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
> @@ -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];
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
> index 0dc736c..057a524 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
> @@ -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) \
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
> index d1b0a1e..20afec6 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
> @@ -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
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> index b4afff6..d53f433 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> @@ -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)
>
>
>