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

[Javier Martinez Canillas]

Hello Greg,

On 08/21/2016 12:02 PM, Greg Kroah-Hartman wrote:
> 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@xxxxxxxxxxxxxxx>
>> Acked-by: David Daney <david.daney@xxxxxxxxxx>
>> ---
>>
>>  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 :(
> 

Ok, it used to apply when the patch was posted so I guess that something
changed in the code. I'll post a new one rebased on top of latest head.

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America