Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-19 12:00:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: slicoss: change some macros into inline functions

Browse Source 
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2016-11-21 17:48:24 +01:00 committed by Greg Kroah-Hartman
parent 08711b876d
commit c208faefdf
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/slicoss/slic.h
View File

@ -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 {
/*

6
drivers/staging/slicoss/slicoss.c
View File

@ -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: