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

David Daney ddaney at caviumnetworks.com
Thu Jul 14 17:26:52 UTC 2016


On 07/14/2016 10:06 AM, Javier Martinez Canillas wrote:
> 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.
>
> Signed-off-by: Javier Martinez Canillas <javier at osg.samsung.com>

Acked-by: David Daney <david.daney at cavium.com>


> ---
>
>   drivers/staging/octeon/ethernet.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
> index e9cd5f242921..c0c62143ffc8 100644
> --- a/drivers/staging/octeon/ethernet.c
> +++ b/drivers/staging/octeon/ethernet.c
> @@ -238,7 +238,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);
>   	int index = INDEX(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;
>



More information about the devel mailing list