* [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module
@ 2016-07-14 17:06 Javier Martinez Canillas
2016-07-14 17:26 ` David Daney
2016-08-21 16:02 ` Greg Kroah-Hartman
0 siblings, 2 replies; 4+ messages in thread
From: Javier Martinez Canillas @ 2016-07-14 17:06 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, devel, Aaro Koskinen, Aybuke Ozdemir,
Greg Kroah-Hartman, Cristina Moraru, Laura Garcia Liebana,
Bhaktipriya Shridhar, David Daney
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>
---
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;
--
2.5.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module
2016-07-14 17:06 [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
@ 2016-07-14 17:26 ` David Daney
2016-08-21 16:02 ` Greg Kroah-Hartman
1 sibling, 0 replies; 4+ messages in thread
From: David Daney @ 2016-07-14 17:26 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: linux-kernel, devel, Aaro Koskinen, Aybuke Ozdemir,
Greg Kroah-Hartman, Cristina Moraru, Laura Garcia Liebana,
Bhaktipriya Shridhar, David Daney
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@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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module
2016-07-14 17:06 [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
2016-07-14 17:26 ` David Daney
@ 2016-08-21 16:02 ` Greg Kroah-Hartman
2016-08-25 13:54 ` Javier Martinez Canillas
1 sibling, 1 reply; 4+ messages in thread
From: Greg Kroah-Hartman @ 2016-08-21 16:02 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: linux-kernel, devel, Aaro Koskinen, Aybuke Ozdemir,
Cristina Moraru, Laura Garcia Liebana, Bhaktipriya Shridhar,
David Daney
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 :(
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module
2016-08-21 16:02 ` Greg Kroah-Hartman
@ 2016-08-25 13:54 ` Javier Martinez Canillas
0 siblings, 0 replies; 4+ messages in thread
From: Javier Martinez Canillas @ 2016-08-25 13:54 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, devel, Aaro Koskinen, Aybuke Ozdemir,
Cristina Moraru, Laura Garcia Liebana, Bhaktipriya Shridhar,
David Daney
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@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 :(
>
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-25 13:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-14 17:06 [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
2016-07-14 17:26 ` David Daney
2016-08-21 16:02 ` Greg Kroah-Hartman
2016-08-25 13:54 ` Javier Martinez Canillas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox