diff options
| author |   Javier Martinez Canillas <javier@osg.samsung.com> | 2016-09-02 01:46:34 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-02 14:55:54 +0200 |
| commit | aa652b1ccbd0d3a9cd4ecdec6d36935f78c838da (patch) | |
| tree | 252d81de623dbc5c2454af4ee608157e37b45cda /drivers/staging/octeon | |
| parent | staging: rtl8172: fixed comment style in rts871x_cmd.c (diff) | |
| download | linux-dev-aa652b1ccbd0d3a9cd4ecdec6d36935f78c838da.tar.xz linux-dev-aa652b1ccbd0d3a9cd4ecdec6d36935f78c838da.zip | |
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>
Diffstat (limited to 'drivers/staging/octeon')
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 5497facec83a..0bd5c1816e0f 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -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); 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; #else int vlan_bytes = 0; |