diff options
author | Himangi Saraogi <himangi774@gmail.com> | 2014-07-27 03:07:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-29 18:31:56 -0400 |
commit | d0e992aa0270663872c56f07473a7f43adee5bd5 (patch) | |
tree | 9db3fe1d8ce95598ca8fdad98db9aa3551bab4df /net | |
parent | 5a8dbf03ddf6dfe465b9f062e5b969f9606643f5 (diff) |
openvswitch: Use IS_ERR_OR_NULL
This patch introduces the use of the macro IS_ERR_OR_NULL in place of
tests for NULL and IS_ERR.
The following Coccinelle semantic patch was used for making the change:
@@
expression e;
@@
- e == NULL || IS_ERR(e)
+ IS_ERR_OR_NULL(e)
|| ...
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/openvswitch/datapath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 3c461e1e4554..7ad3f029baae 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -781,7 +781,7 @@ static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow, | |||
781 | 781 | ||
782 | skb = ovs_flow_cmd_alloc_info(ovsl_dereference(flow->sf_acts), info, | 782 | skb = ovs_flow_cmd_alloc_info(ovsl_dereference(flow->sf_acts), info, |
783 | always); | 783 | always); |
784 | if (!skb || IS_ERR(skb)) | 784 | if (IS_ERR_OR_NULL(skb)) |
785 | return skb; | 785 | return skb; |
786 | 786 | ||
787 | retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb, | 787 | retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb, |