mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Lothar Waßmann" <LW@KARO-electronics.de>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
	"Russell King" <rmk+kernel@arm.linux.org.uk>,
	"Frank Li" <Frank.Li@freescale.com>,
	"Fabio Estevam" <fabio.estevam@freescale.com>,
	linux-kernel@vger.kernel.org,
	"Lothar Waßmann" <LW@KARO-electronics.de>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 3/9] net: fec: properly parenthesize macro args
Date: Tue, 28 Oct 2014 14:22:58 +0100	[thread overview]
Message-ID: <1414502584-10583-4-git-send-email-LW@KARO-electronics.de> (raw)
In-Reply-To: <1414502584-10583-1-git-send-email-LW@KARO-electronics.de>


Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
 drivers/net/ethernet/freescale/fec.h |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index e778b9e..27e75cf 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -279,36 +279,37 @@ struct bufdesc_ex {
 #define FEC_ENET_MAX_TX_QS	3
 #define FEC_ENET_MAX_RX_QS	3
 
-#define FEC_R_DES_START(X)	((X == 1) ? FEC_R_DES_START_1 : \
-				((X == 2) ? \
+#define FEC_R_DES_START(X)	(((X) == 1) ? FEC_R_DES_START_1 : \
+				(((X) == 2) ? \
 					FEC_R_DES_START_2 : FEC_R_DES_START_0))
-#define FEC_X_DES_START(X)	((X == 1) ? FEC_X_DES_START_1 : \
-				((X == 2) ? \
+#define FEC_X_DES_START(X)	(((X) == 1) ? FEC_X_DES_START_1 : \
+				(((X) == 2) ? \
 					FEC_X_DES_START_2 : FEC_X_DES_START_0))
-#define FEC_R_DES_ACTIVE(X)	((X == 1) ? FEC_R_DES_ACTIVE_1 : \
-				((X == 2) ? \
+#define FEC_R_DES_ACTIVE(X)	(((X) == 1) ? FEC_R_DES_ACTIVE_1 : \
+				(((X) == 2) ? \
 				   FEC_R_DES_ACTIVE_2 : FEC_R_DES_ACTIVE_0))
-#define FEC_X_DES_ACTIVE(X)	((X == 1) ? FEC_X_DES_ACTIVE_1 : \
-				((X == 2) ? \
+#define FEC_X_DES_ACTIVE(X)	(((X) == 1) ? FEC_X_DES_ACTIVE_1 : \
+				(((X) == 2) ? \
 				   FEC_X_DES_ACTIVE_2 : FEC_X_DES_ACTIVE_0))
 
-#define FEC_DMA_CFG(X)		((X == 2) ? FEC_DMA_CFG_2 : FEC_DMA_CFG_1)
+#define FEC_DMA_CFG(X)		(((X) == 2) ? FEC_DMA_CFG_2 : FEC_DMA_CFG_1)
 
 #define DMA_CLASS_EN		(1 << 16)
-#define FEC_RCMR(X)		((X == 2) ? FEC_RCMR_2 : FEC_RCMR_1)
+#define FEC_RCMR(X)		(((X) == 2) ? FEC_RCMR_2 : FEC_RCMR_1)
 #define IDLE_SLOPE_MASK		0xffff
 #define IDLE_SLOPE_1		0x200 /* BW fraction: 0.5 */
 #define IDLE_SLOPE_2		0x200 /* BW fraction: 0.5 */
-#define IDLE_SLOPE(X)		((X == 1) ? (IDLE_SLOPE_1 & IDLE_SLOPE_MASK) : \
+#define IDLE_SLOPE(X)		(((X) == 1) ?				\
+				(IDLE_SLOPE_1 & IDLE_SLOPE_MASK) :	\
 				(IDLE_SLOPE_2 & IDLE_SLOPE_MASK))
 #define RCMR_MATCHEN		(0x1 << 16)
-#define RCMR_CMP_CFG(v, n)	((v & 0x7) <<  (n << 2))
+#define RCMR_CMP_CFG(v, n)	(((v) & 0x7) <<  (n << 2))
 #define RCMR_CMP_1		(RCMR_CMP_CFG(0, 0) | RCMR_CMP_CFG(1, 1) | \
 				RCMR_CMP_CFG(2, 2) | RCMR_CMP_CFG(3, 3))
 #define RCMR_CMP_2		(RCMR_CMP_CFG(4, 0) | RCMR_CMP_CFG(5, 1) | \
 				RCMR_CMP_CFG(6, 2) | RCMR_CMP_CFG(7, 3))
-#define RCMR_CMP(X)		((X == 1) ? RCMR_CMP_1 : RCMR_CMP_2)
-#define FEC_TX_BD_FTYPE(X)	((X & 0xf) << 20)
+#define RCMR_CMP(X)		(((X) == 1) ? RCMR_CMP_1 : RCMR_CMP_2)
+#define FEC_TX_BD_FTYPE(X)	(((X) & 0xf) << 20)
 
 /* The number of Tx and Rx buffers.  These are allocated from the page
  * pool.  The code may assume these are power of two, so it it best
@@ -359,7 +360,7 @@ struct bufdesc_ex {
 /* ENET interrupt coalescing macro define */
 #define FEC_ITR_CLK_SEL		(0x1 << 30)
 #define FEC_ITR_EN		(0x1 << 31)
-#define FEC_ITR_ICFT(X)		((X & 0xff) << 20)
+#define FEC_ITR_ICFT(X)		(((X) & 0xff) << 20)
 #define FEC_ITR_ICTT(X)		((X) & 0xffff)
 #define FEC_ITR_ICFT_DEFAULT	200  /* Set 200 frame count threshold */
 #define FEC_ITR_ICTT_DEFAULT	1000 /* Set 1000us timer threshold */
-- 
1.7.10.4


  parent reply	other threads:[~2014-10-28 13:23 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-28 11:01 [PATCHv2 0/6] net: fec: fix regression on i.MX28 introduced by rx_copybreak support Lothar Waßmann
2014-10-28 11:01 ` [PATCHv2 1/6] net: fec: indentation cleanup; no functional change Lothar Waßmann
2014-10-28 11:01 ` [PATCHv2 2/6] net: fec: declare bufdesc_ex flag as bool Lothar Waßmann
2014-10-28 11:01 ` [PATCHv2 3/6] net: fec: improve access to quirk flags by copying them into fec_enet_private struct Lothar Waßmann
2014-10-28 11:01 ` [PATCHv2 4/6] net: fec: use swab32s() instead of cpu_to_be32() Lothar Waßmann
2014-10-28 11:01 ` [PATCHv2 5/6] net: fec: simplify loop counter handling in swap_buffer() Lothar Waßmann
2014-10-28 11:01 ` [PATCHv2 6/6] net: fec: fix regression on i.MX28 introduced by rx_copybreak support Lothar Waßmann
2014-10-28 11:12   ` David Laight
2014-10-28 12:36     ` Lothar Waßmann
2014-10-28 13:01       ` David Laight
2014-10-28 13:30         ` Lothar Waßmann
2014-10-28 11:14   ` David Laight
2014-10-28 12:10     ` Lothar Waßmann
2014-10-28 13:22 ` Lothar Waßmann
2014-10-28 13:22   ` [PATCHv3 1/9] net: fec: indentation cleanup Lothar Waßmann
2014-10-28 13:22   ` [PATCHv3 2/9] net: fec: consistently use lower case chars as hex digits Lothar Waßmann
2014-10-28 13:22   ` Lothar Waßmann [this message]
2014-10-28 13:22   ` [PATCHv3 4/9] net: fec: declare bufdesc_ex flag as bool Lothar Waßmann
2014-10-28 13:23   ` [PATCHv3 5/9] net: fec: improve access to quirk flags by copying them into fec_enet_private struct Lothar Waßmann
2014-10-28 13:23   ` [PATCHv3 6/9] net: fec: use swab32s() instead of cpu_to_be32() Lothar Waßmann
2014-10-28 13:23   ` [PATCHv3 7/9] net: fec: simplify loop counter handling in swap_buffer() Lothar Waßmann
2014-10-28 13:23   ` [PATCHv3 8/9] net: fec: remove unused return value from swap_buffer() Lothar Waßmann
2014-10-28 13:23   ` [PATCHv3 9/9] net: fec: fix regression on i.MX28 introduced by rx_copybreak support Lothar Waßmann
2014-11-03 22:58     ` Stefan Wahren
2014-10-29 19:34   ` David Miller
2014-10-30  6:51     ` Lothar Waßmann
2014-10-30 16:17       ` David Miller
2014-10-31  5:32         ` Lothar Waßmann
2014-11-04 10:29           ` Lothar Waßmann
2014-11-04 16:28             ` David Miller
2014-11-05  5:21               ` Lothar Waßmann
2014-11-05 20:52                 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414502584-10583-4-git-send-email-LW@KARO-electronics.de \
    --to=lw@karo-electronics.de \
    --cc=Frank.Li@freescale.com \
    --cc=davem@davemloft.net \
    --cc=fabio.estevam@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®