net: marvell: prestera: Fix a NULL vs IS_ERR() check in some functions

rhashtable_lookup_fast() returns NULL when failed instead of error
pointer.

Fixes: 396b80cb5cc8 ("net: marvell: prestera: Add neighbour cache accounting")
Fixes: 0a23ae237171 ("net: marvell: prestera: Add router nexthops ABI")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Link: https://lore.kernel.org/r/20221125012751.23249-1-shangxiaojing@huawei.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router.c b/drivers/net/ethernet/marvell/prestera/prestera_router.c
index 4046be0e86ff4a60aeb793cd59746446c477fb65..a9a1028cb17bbb736c0b0725acbf9ef2d3f7a166 100644 (file)
--- a/drivers/net/ethernet/marvell/prestera/prestera_router.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router.c
@@ -457,7 +457,7 @@ prestera_kern_neigh_cache_find(struct prestera_switch *sw,
        n_cache =
         rhashtable_lookup_fast(&sw->router->kern_neigh_cache_ht, key,
                                __prestera_kern_neigh_cache_ht_params);
-       return IS_ERR(n_cache) ? NULL : n_cache;
+       return n_cache;
 }
 
 static void

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
index aa080dc57ff0050a216c096eb9b585fdf56aaf8f..02faaea2aefaa600329838c60e0ac0890f39ec8c 100644 (file)
--- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
@@ -330,7 +330,7 @@ prestera_nh_neigh_find(struct prestera_switch *sw,
 
        nh_neigh = rhashtable_lookup_fast(&sw->router->nh_neigh_ht,
                                          key, __prestera_nh_neigh_ht_params);
-       return IS_ERR(nh_neigh) ? NULL : nh_neigh;
+       return nh_neigh;
 }
 
 struct prestera_nh_neigh *
@@ -484,7 +484,7 @@ __prestera_nexthop_group_find(struct prestera_switch *sw,
 
        nh_grp = rhashtable_lookup_fast(&sw->router->nexthop_group_ht,
                                        key, __prestera_nexthop_group_ht_params);
-       return IS_ERR(nh_grp) ? NULL : nh_grp;
+       return nh_grp;
 }
 
 static struct prestera_nexthop_group *