Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 09:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

cxgb4: unexport cxgb4_dcb_enabled

Browse Source 
A recent cleanup marked cxgb4_dcb_enabled as 'static', which is correct, but this ignored
how the symbol is also exported. In addition, the export can be compiled out when modules
are disabled, causing a harmless compiler warning in configurations for which it is not
used at all:

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:282:12: error: 'cxgb4_dcb_enabled' defined but not used [-Werror=unused-function]

This removes the export and moves the function into the correct #ifdef so we only build
it when there are users.

Fixes: 50935857f8 ("cxgb4: mark symbols static where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2016-09-30 18:15:33 +02:00 committed by David S. Miller
parent fa34cd94fb
commit 7c70c4f8b2
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -277,11 +277,9 @@ static void dcb_tx_queue_prio_enable(struct net_device *dev, int enable)
txq->dcb_prio = value; txq->dcb_prio = value;
} }
} }
#endif /* CONFIG_CHELSIO_T4_DCB */
static int cxgb4_dcb_enabled(const struct net_device *dev) static int cxgb4_dcb_enabled(const struct net_device *dev)
{ {
#ifdef CONFIG_CHELSIO_T4_DCB
struct port_info *pi = netdev_priv(dev); struct port_info *pi = netdev_priv(dev);
if (!pi->dcb.enabled) if (!pi->dcb.enabled)
@ -289,11 +287,8 @@ static int cxgb4_dcb_enabled(const struct net_device *dev)
return ((pi->dcb.state == CXGB4_DCB_STATE_FW_ALLSYNCED) || return ((pi->dcb.state == CXGB4_DCB_STATE_FW_ALLSYNCED) ||
(pi->dcb.state == CXGB4_DCB_STATE_HOST)); (pi->dcb.state == CXGB4_DCB_STATE_HOST));
#else
return 0;
#endif
} }
EXPORT_SYMBOL(cxgb4_dcb_enabled); #endif /* CONFIG_CHELSIO_T4_DCB */
void t4_os_link_changed(struct adapter *adapter, int port_id, int link_stat) void t4_os_link_changed(struct adapter *adapter, int port_id, int link_stat)
{ {