Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1526905

[PATCH] staging: slicoss: change some macros into inline functions

Show all headers | View raw

This patch changes macros into inline functions to avoid this checkpatch
check:
Macro argument 'x' may be better as '(x)' to avoid precedence issues

It also removes two macros because they aren't being used.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
---
 drivers/staging/slicoss/slic.h    | 20 ++++++++++++++------
 drivers/staging/slicoss/slicoss.c |  6 +++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
index f04d304..1f6562c 100644
--- a/drivers/staging/slicoss/slic.h
+++ b/drivers/staging/slicoss/slic.h
@@ -215,12 +215,20 @@ struct mcast_address {
 #define MAC_LOOPBACK     0x00000010
 #define MAC_ALLMCAST     0x00000020
 
-#define SLIC_DUPLEX(x)    ((x == LINK_FULLD) ? "FDX" : "HDX")
-#define SLIC_SPEED(x)     ((x == LINK_100MB) ? "100Mb" : ((x == LINK_1000MB) ?\
-				"1000Mb" : " 10Mb"))
-#define SLIC_LINKSTATE(x) ((x == LINK_DOWN) ? "Down" : "Up  ")
-#define SLIC_ADAPTER_STATE(x) ((x == ADAPT_UP) ? "UP" : "Down")
-#define SLIC_CARD_STATE(x)    ((x == CARD_UP) ? "UP" : "Down")
+static inline const char *slic_linkstate(unsigned char x)
+{
+	return ((x == LINK_DOWN) ? "Down" : "Up  ");
+}
+
+static inline const char *slic_adapter_state(unsigned char x)
+{
+	return ((x == ADAPT_UP) ? "UP" : "Down");
+}
+
+static inline const char *slic_card_state(uint x)
+{
+	return ((x == CARD_UP) ? "UP" : "Down");
+}
 
 struct slic_iface_stats {
 	/*
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 99e9084..b6ec0a1 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1806,10 +1806,10 @@ static void slic_xmit_fail(struct adapter *adapter,
 			dev_err(&adapter->netdev->dev,
 				"reject xmit skb[%p: %x] linkstate[%s] adapter[%s:%d] card[%s:%d]\n",
 				skb, skb->pkt_type,
-				SLIC_LINKSTATE(adapter->linkstate),
-				SLIC_ADAPTER_STATE(adapter->state),
+				slic_linkstate(adapter->linkstate),
+				slic_adapter_state(adapter->state),
 				adapter->state,
-				SLIC_CARD_STATE(adapter->card->state),
+				slic_card_state(adapter->card->state),
 				adapter->card->state);
 			break;
 		case XMIT_FAIL_ZERO_LENGTH:
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] staging: slicoss: change some macros into inline functions Sergio Paracuellos <sergio.paracuellos@gmail.com> - 2016-11-21 17:50 +0100

csiph-web