mlxsw: spectrum_router: Pass router to mlxsw_sp_router_schedule_work() directly

Instead of passing a notifier block and deducing the router pointer from
that in the helper, do that in the caller, and pass the result. In the
following patches, the pointer will also be made useful in the caller.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index edfc42230285be00c1e03699db5c579cb59822ee..7b1877c116ed2bd61bbddd882c0a20484dd2e7cd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -2748,13 +2748,11 @@ static void mlxsw_sp_router_update_priority_work(struct work_struct *work)
 }
 
 static int mlxsw_sp_router_schedule_work(struct net *net,
-                                        struct notifier_block *nb,
+                                        struct mlxsw_sp_router *router,
                                         void (*cb)(struct work_struct *))
 {
        struct mlxsw_sp_netevent_work *net_work;
-       struct mlxsw_sp_router *router;
 
-       router = container_of(nb, struct mlxsw_sp_router, netevent_nb);
        if (!net_eq(net, mlxsw_sp_net(router->mlxsw_sp)))
                return NOTIFY_DONE;
 
@@ -2773,11 +2771,14 @@ static int mlxsw_sp_router_netevent_event(struct notifier_block *nb,
 {
        struct mlxsw_sp_netevent_work *net_work;
        struct mlxsw_sp_port *mlxsw_sp_port;
+       struct mlxsw_sp_router *router;
        struct mlxsw_sp *mlxsw_sp;
        unsigned long interval;
        struct neigh_parms *p;
        struct neighbour *n;
 
+       router = container_of(nb, struct mlxsw_sp_router, netevent_nb);
+
        switch (event) {
        case NETEVENT_DELAY_PROBE_TIME_UPDATE:
                p = ptr;
@@ -2830,11 +2831,11 @@ static int mlxsw_sp_router_netevent_event(struct notifier_block *nb,
                break;
        case NETEVENT_IPV4_MPATH_HASH_UPDATE:
        case NETEVENT_IPV6_MPATH_HASH_UPDATE:
-               return mlxsw_sp_router_schedule_work(ptr, nb,
+               return mlxsw_sp_router_schedule_work(ptr, router,
                                mlxsw_sp_router_mp_hash_event_work);
 
        case NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE:
-               return mlxsw_sp_router_schedule_work(ptr, nb,
+               return mlxsw_sp_router_schedule_work(ptr, router,
                                mlxsw_sp_router_update_priority_work);
        }