staging: octeon: Use IS_ENABLED() instead of checking for built-in or module

The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.

Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Javier Martinez Canillas 2016-09-02 01:46:34 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель 8292b4de4e
Коммит aa652b1ccb
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -248,7 +248,7 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu)
{ {
struct octeon_ethernet *priv = netdev_priv(dev); struct octeon_ethernet *priv = netdev_priv(dev);
int interface = INTERFACE(priv->port); int interface = INTERFACE(priv->port);
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #if IS_ENABLED(CONFIG_VLAN_8021Q)
int vlan_bytes = 4; int vlan_bytes = 4;
#else #else
int vlan_bytes = 0; int vlan_bytes = 0;