* [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module
@ 2016-09-09 12:43 Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 1/8] appletalk: " Javier Martinez Canillas
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, Alexey Kuznetsov, Nikolay Aleksandrov,
James Chapman, Alexander Duyck, Vlad Yasevich, Florian Westphal,
Arnaldo Carvalho de Melo, Hideaki YOSHIFUJI, Daniel Borkmann,
stephen hemminger, Tom Herbert, linux-sctp, Antonio Quartulli,
Jamal Hadi Salim, Herbert Xu, Mugunthan V N, Steffen Klassert,
Eric Dumazet, Felipe Balbi, netdev, Jiri Pirko, David S. Miller,
Neil Horman, Jarod Wilson, Patrick McHardy, Paolo Abeni,
James Morris
Hello David,
This trivial series replace the open coding to check for a Kconfig symbol
being built-in or module, with IS_ENABLED() macro that does exactly that.
Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.
Best regards,
Javier
Javier Martinez Canillas (8):
appletalk: use IS_ENABLED() instead of checking for built-in or module
lec: use IS_ENABLED() instead of checking for built-in or module
net: use IS_ENABLED() instead of checking for built-in or module
ipv4: use IS_ENABLED() instead of checking for built-in or module
l2tp: use IS_ENABLED() instead of checking for built-in or module
net: sched: use IS_ENABLED() instead of checking for built-in or
module
sctp: use IS_ENABLED() instead of checking for built-in or module
xfrm: use IS_ENABLED() instead of checking for built-in or module
net/appletalk/ddp.c | 2 +-
net/atm/lec.c | 12 ++++++------
net/core/dev.c | 3 +--
net/ipv4/ip_output.c | 2 +-
net/l2tp/l2tp_core.h | 2 +-
net/l2tp/l2tp_eth.c | 4 ++--
net/l2tp/l2tp_ppp.c | 4 ++--
net/sched/cls_flow.c | 6 +++---
net/sctp/auth.c | 2 +-
net/xfrm/xfrm_algo.c | 2 +-
10 files changed, 19 insertions(+), 20 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/8] appletalk: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 2/8] lec: " Javier Martinez Canillas
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, netdev, Arnaldo Carvalho de Melo,
David S. Miller
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@osg.samsung.com>
---
net/appletalk/ddp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index f066781be3c8..10d2bdce686e 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1278,7 +1278,7 @@ out:
return err;
}
-#if defined(CONFIG_IPDDP) || defined(CONFIG_IPDDP_MODULE)
+#if IS_ENABLED(CONFIG_IPDDP)
static __inline__ int is_ip_over_ddp(struct sk_buff *skb)
{
return skb->data[12] == 22;
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/8] lec: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 1/8] appletalk: " Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 3/8] net: " Javier Martinez Canillas
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, Felipe Balbi, netdev, David S. Miller,
Florian Westphal, Antonio Quartulli, Mugunthan V N
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@osg.samsung.com>
---
net/atm/lec.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/atm/lec.c b/net/atm/lec.c
index e574a7e9db6f..5d2693826afb 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -31,7 +31,7 @@
#include <linux/atmlec.h>
/* Proxy LEC knows about bridging */
-#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+#if IS_ENABLED(CONFIG_BRIDGE)
#include "../bridge/br_private.h"
static unsigned char bridge_ula_lec[] = { 0x01, 0x80, 0xc2, 0x00, 0x00 };
@@ -121,7 +121,7 @@ static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
/* Device structures */
static struct net_device *dev_lec[MAX_LEC_ITF];
-#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+#if IS_ENABLED(CONFIG_BRIDGE)
static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
{
char *buff;
@@ -155,7 +155,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
sk->sk_data_ready(sk);
}
}
-#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
+#endif /* IS_ENABLED(CONFIG_BRIDGE) */
/*
* Open/initialize the netdevice. This is called (in the current kernel)
@@ -222,7 +222,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n",
(long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb),
(long)skb_end_pointer(skb));
-#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+#if IS_ENABLED(CONFIG_BRIDGE)
if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0)
lec_handle_bridge(skb, dev);
#endif
@@ -426,7 +426,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
(unsigned short)(0xffff & mesg->content.normal.flag);
break;
case l_should_bridge:
-#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+#if IS_ENABLED(CONFIG_BRIDGE)
{
pr_debug("%s: bridge zeppelin asks about %pM\n",
dev->name, mesg->content.proxy.mac_addr);
@@ -452,7 +452,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
sk->sk_data_ready(sk);
}
}
-#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
+#endif /* IS_ENABLED(CONFIG_BRIDGE) */
break;
default:
pr_info("%s: Unknown message type %d\n", dev->name, mesg->type);
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/8] net: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 1/8] appletalk: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 2/8] lec: " Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 4/8] ipv4: " Javier Martinez Canillas
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, Nikolay Aleksandrov, Alexander Duyck,
Tom Herbert, Jiri Pirko, David S. Miller, Jarod Wilson,
Paolo Abeni, netdev, Daniel Borkmann, Eric Dumazet
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@osg.samsung.com>
---
net/core/dev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index c7d7db49826d..9e76d4df6ca0 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3904,8 +3904,7 @@ static __latent_entropy void net_tx_action(struct softirq_action *h)
}
}
-#if (defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)) && \
- (defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE))
+#if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_ATM_LANE)
/* This hook is defined here for ATM LANE */
int (*br_fdb_test_addr_hook)(struct net_device *dev,
unsigned char *addr) __read_mostly;
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/8] ipv4: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
` (2 preceding siblings ...)
2016-09-09 12:43 ` [PATCH 3/8] net: " Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 5/8] l2tp: " Javier Martinez Canillas
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, Alexey Kuznetsov, netdev,
David S. Miller, Patrick McHardy, James Morris,
Hideaki YOSHIFUJI
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@osg.samsung.com>
---
net/ipv4/ip_output.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 65569274efb8..b913f5bf0757 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -490,7 +490,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
to->tc_index = from->tc_index;
#endif
nf_copy(to, from);
-#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
+#if IS_ENABLED(CONFIG_IP_VS)
to->ipvs_property = from->ipvs_property;
#endif
skb_copy_secmark(to, from);
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/8] l2tp: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
` (3 preceding siblings ...)
2016-09-09 12:43 ` [PATCH 4/8] ipv4: " Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 6/8] net: sched: " Javier Martinez Canillas
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, James Chapman, netdev,
stephen hemminger, David S. Miller, Eric Dumazet
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@osg.samsung.com>
---
net/l2tp/l2tp_core.h | 2 +-
net/l2tp/l2tp_eth.c | 4 ++--
net/l2tp/l2tp_ppp.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index 5871537af387..2599af6378e4 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -139,7 +139,7 @@ struct l2tp_session {
void (*session_close)(struct l2tp_session *session);
void (*ref)(struct l2tp_session *session);
void (*deref)(struct l2tp_session *session);
-#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
+#if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
void (*show)(struct seq_file *m, void *priv);
#endif
uint8_t priv[0]; /* private data */
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 57fc5a46ce06..ef2cd30ca06e 100644
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -195,7 +195,7 @@ static void l2tp_eth_delete(struct l2tp_session *session)
}
}
-#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
+#if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
static void l2tp_eth_show(struct seq_file *m, void *arg)
{
struct l2tp_session *session = arg;
@@ -268,7 +268,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p
priv->tunnel_sock = tunnel->sock;
session->recv_skb = l2tp_eth_dev_recv;
session->session_close = l2tp_eth_delete;
-#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
+#if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
session->show = l2tp_eth_show;
#endif
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 34eff77982cf..41d47bfda15c 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -552,7 +552,7 @@ out:
return error;
}
-#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
+#if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
static void pppol2tp_show(struct seq_file *m, void *arg)
{
struct l2tp_session *session = arg;
@@ -723,7 +723,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
session->recv_skb = pppol2tp_recv;
session->session_close = pppol2tp_session_close;
-#if defined(CONFIG_L2TP_DEBUGFS) || defined(CONFIG_L2TP_DEBUGFS_MODULE)
+#if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
session->show = pppol2tp_show;
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/8] net: sched: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
` (4 preceding siblings ...)
2016-09-09 12:43 ` [PATCH 5/8] l2tp: " Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 7/8] sctp: " Javier Martinez Canillas
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, netdev, David S. Miller, Jamal Hadi Salim
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@osg.samsung.com>
---
net/sched/cls_flow.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 2c1ae549edbf..a379bae1d74e 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -29,7 +29,7 @@
#include <net/route.h>
#include <net/flow_dissector.h>
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#include <net/netfilter/nf_conntrack.h>
#endif
@@ -125,14 +125,14 @@ static u32 flow_get_mark(const struct sk_buff *skb)
static u32 flow_get_nfct(const struct sk_buff *skb)
{
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
return addr_fold(skb->nfct);
#else
return 0;
#endif
}
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#define CTTUPLE(skb, member) \
({ \
enum ip_conntrack_info ctinfo; \
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 7/8] sctp: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
` (5 preceding siblings ...)
2016-09-09 12:43 ` [PATCH 6/8] net: sched: " Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-09 16:43 ` Neil Horman
2016-09-09 12:43 ` [PATCH 8/8] xfrm: " Javier Martinez Canillas
2016-09-11 4:19 ` [PATCH 0/8] net: " David Miller
8 siblings, 1 reply; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, netdev, Vlad Yasevich, Neil Horman,
linux-sctp, David S. Miller
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@osg.samsung.com>
---
net/sctp/auth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 912eb1685a5d..f99d4855d3de 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -48,7 +48,7 @@ static struct sctp_hmac sctp_hmac_list[SCTP_AUTH_NUM_HMACS] = {
/* id 2 is reserved as well */
.hmac_id = SCTP_AUTH_HMAC_ID_RESERVED_2,
},
-#if defined (CONFIG_CRYPTO_SHA256) || defined (CONFIG_CRYPTO_SHA256_MODULE)
+#if IS_ENABLED(CONFIG_CRYPTO_SHA256)
{
.hmac_id = SCTP_AUTH_HMAC_ID_SHA256,
.hmac_name = "hmac(sha256)",
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 8/8] xfrm: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
` (6 preceding siblings ...)
2016-09-09 12:43 ` [PATCH 7/8] sctp: " Javier Martinez Canillas
@ 2016-09-09 12:43 ` Javier Martinez Canillas
2016-09-11 4:19 ` [PATCH 0/8] net: " David Miller
8 siblings, 0 replies; 11+ messages in thread
From: Javier Martinez Canillas @ 2016-09-09 12:43 UTC (permalink / raw)
To: linux-kernel
Cc: Javier Martinez Canillas, Herbert Xu, Steffen Klassert, netdev,
David S. Miller
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@osg.samsung.com>
---
net/xfrm/xfrm_algo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 250e567ba3d6..44ac85fe2bc9 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -17,7 +17,7 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
#include <net/xfrm.h>
-#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
+#if IS_ENABLED(CONFIG_INET_ESP) || IS_ENABLED(CONFIG_INET6_ESP)
#include <net/esp.h>
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 7/8] sctp: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 ` [PATCH 7/8] sctp: " Javier Martinez Canillas
@ 2016-09-09 16:43 ` Neil Horman
0 siblings, 0 replies; 11+ messages in thread
From: Neil Horman @ 2016-09-09 16:43 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: linux-kernel, netdev, Vlad Yasevich, linux-sctp, David S. Miller
On Fri, Sep 09, 2016 at 08:43:19AM -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.
>
> 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@osg.samsung.com>
> ---
>
> net/sctp/auth.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/sctp/auth.c b/net/sctp/auth.c
> index 912eb1685a5d..f99d4855d3de 100644
> --- a/net/sctp/auth.c
> +++ b/net/sctp/auth.c
> @@ -48,7 +48,7 @@ static struct sctp_hmac sctp_hmac_list[SCTP_AUTH_NUM_HMACS] = {
> /* id 2 is reserved as well */
> .hmac_id = SCTP_AUTH_HMAC_ID_RESERVED_2,
> },
> -#if defined (CONFIG_CRYPTO_SHA256) || defined (CONFIG_CRYPTO_SHA256_MODULE)
> +#if IS_ENABLED(CONFIG_CRYPTO_SHA256)
> {
> .hmac_id = SCTP_AUTH_HMAC_ID_SHA256,
> .hmac_name = "hmac(sha256)",
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
` (7 preceding siblings ...)
2016-09-09 12:43 ` [PATCH 8/8] xfrm: " Javier Martinez Canillas
@ 2016-09-11 4:19 ` David Miller
8 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2016-09-11 4:19 UTC (permalink / raw)
To: javier
Cc: linux-kernel, kuznet, nikolay, jchapman, aduyck, vyasevich, fw,
acme, yoshfuji, daniel, stephen, tom, linux-sctp, a, jhs,
herbert, mugunthanvnm, steffen.klassert, edumazet, felipe.balbi,
netdev, jiri, nhorman, jarod, kaber, pabeni, jmorris
From: Javier Martinez Canillas <javier@osg.samsung.com>
Date: Fri, 9 Sep 2016 08:43:12 -0400
> This trivial series replace the open coding to check for a Kconfig symbol
> being built-in or module, with IS_ENABLED() macro that does exactly that.
>
> Using the macro makes the code more readable by helping abstract away some
> of the Kconfig built-in and module enable details.
Series applied, thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-09-11 4:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-09 12:43 [PATCH 0/8] net: use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 1/8] appletalk: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 2/8] lec: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 3/8] net: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 4/8] ipv4: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 5/8] l2tp: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 6/8] net: sched: " Javier Martinez Canillas
2016-09-09 12:43 ` [PATCH 7/8] sctp: " Javier Martinez Canillas
2016-09-09 16:43 ` Neil Horman
2016-09-09 12:43 ` [PATCH 8/8] xfrm: " Javier Martinez Canillas
2016-09-11 4:19 ` [PATCH 0/8] net: " David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).