Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle. To: Jamal Hadi Salim To: Jiri Pirko To: "David S. Miller" To: Eric Dumazet To: Jakub Kicinski To: Paolo Abeni To: Simon Horman Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Philipp Hahn --- net/sched/cls_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 4829c27446e3369ad2ae9b3fcb285eca47d59933..4208225e7a4acaf0c331096ebf941f68cc2ed992 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -2444,7 +2444,7 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n, tcf_chain_tp_delete_empty(chain, tp, rtnl_held, NULL); errout_tp: if (chain) { - if (tp && !IS_ERR(tp)) + if (!IS_ERR_OR_NULL(tp)) tcf_proto_put(tp, rtnl_held, NULL); if (!tp_created) tcf_chain_put(chain); @@ -2612,7 +2612,7 @@ static int tc_del_tfilter(struct sk_buff *skb, struct nlmsghdr *n, errout: if (chain) { - if (tp && !IS_ERR(tp)) + if (!IS_ERR_OR_NULL(tp)) tcf_proto_put(tp, rtnl_held, NULL); tcf_chain_put(chain); } @@ -2741,7 +2741,7 @@ static int tc_get_tfilter(struct sk_buff *skb, struct nlmsghdr *n, tfilter_put(tp, fh); errout: if (chain) { - if (tp && !IS_ERR(tp)) + if (!IS_ERR_OR_NULL(tp)) tcf_proto_put(tp, rtnl_held, NULL); tcf_chain_put(chain); } -- 2.43.0