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

[David Daney]

On 08/25/2016 06:55 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.
>
> 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 at osg.samsung.com>
> Acked-by: David Daney <david.daney at cavium.com>
>
> ---
>
> Changes since first post:
> - Added David Daney Acked-by tag.
> - Rebased on top of latest master.
>

You changed something about the patch.  In this case the Subject is not 
"RESEND", but rather "v2".  Incorrect Subject lines like this can lead 
to the patch being inadvertently ignored.

David Daney

>   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 2eb97317f631..a473f034b01a 100644
> --- a/drivers/staging/octeon/ethernet.c
> +++ b/drivers/staging/octeon/ethernet.c
> @@ -237,7 +237,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;
>