diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-12 13:29:47 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-29 16:15:40 +0300 |
| commit | b5ffe634425591db5692fa242da0bbe20d1f76a7 (patch) | |
| tree | 20380e2ff1c60c8b980629c5bb728106839e6a00 /net/openvswitch/datapath.c | |
| parent | 18e8e5c7a9f9aef1b45e0729dc340989d5a954d0 (diff) | |
| download | linux-b5ffe634425591db5692fa242da0bbe20d1f76a7.tar.xz | |
net: Drop unlikely before IS_ERR(_OR_NULL)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net/openvswitch/datapath.c')
| -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 ff8c4a4c1609..01d69680ba5d 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -1143,7 +1143,7 @@ static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info) info, OVS_FLOW_CMD_NEW, false, ufid_flags); - if (unlikely(IS_ERR(reply))) { + if (IS_ERR(reply)) { error = PTR_ERR(reply); goto err_unlock_ovs; } |