From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754109AbcHUV2N (ORCPT <rfc822;w@1wt.eu>);
        Sun, 21 Aug 2016 17:28:13 -0400
Received: from mail.linuxfoundation.org ([140.211.169.12]:34394 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753688AbcHUV2I (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 21 Aug 2016 17:28:08 -0400
Date: Sun, 21 Aug 2016 18:02:49 +0200
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Javier Martinez Canillas <javier@osg.samsung.com>
Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
        Aaro Koskinen <aaro.koskinen@iki.fi>,
        Aybuke Ozdemir <aybuke.147@gmail.com>,
        Cristina Moraru <cristina.moraru09@gmail.com>,
        Laura Garcia Liebana <nevola@gmail.com>,
        Bhaktipriya Shridhar <bhaktipriya96@gmail.com>,
        David Daney <david.daney@cavium.com>
Subject: Re: [PATCH] staging: octeon: Use IS_ENABLED() instead of checking
 for built-in or module
Message-ID: <20160821160249.GA23531@kroah.com>
References: <1468515969-14805-1-git-send-email-javier@osg.samsung.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1468515969-14805-1-git-send-email-javier@osg.samsung.com>
User-Agent: Mutt/1.7.0 (2016-08-17)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Jul 14, 2016 at 01:06:09PM -0400, 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@osg.samsung.com>
> Acked-by: David Daney <david.daney@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;

Fails to apply to the tree :(