staging: dpaa2-ethsw: move port switchdev notifier per ethsw

Register a different switchdev notifier block per ethsw instance.
When probing multiple dpaa2-ethsw instances, without this the register
will fail.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/1573491058-24766-3-git-send-email-ioana.ciornei@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index b25520173feceed3e00a15eb46198d21e52f6923..abbfcbf812415c8132a49b5d90e1faca39105385 100644 (file)
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -1314,10 +1314,6 @@ static int port_switchdev_blocking_event(struct notifier_block *unused,
        return NOTIFY_DONE;
 }
 
-static struct notifier_block port_switchdev_nb = {
-       .notifier_call = port_switchdev_event,
-};
-
 static struct notifier_block port_switchdev_blocking_nb = {
        .notifier_call = port_switchdev_blocking_event,
 };
@@ -1334,7 +1330,8 @@ static int ethsw_register_notifier(struct device *dev)
                return err;
        }
 
-       err = register_switchdev_notifier(&port_switchdev_nb);
+       ethsw->port_switchdev_nb.notifier_call = port_switchdev_event;
+       err = register_switchdev_notifier(&ethsw->port_switchdev_nb);
        if (err) {
                dev_err(dev, "Failed to register switchdev notifier\n");
                goto err_switchdev_nb;
@@ -1349,7 +1346,7 @@ static int ethsw_register_notifier(struct device *dev)
        return 0;
 
 err_switchdev_blocking_nb:
-       unregister_switchdev_notifier(&port_switchdev_nb);
+       unregister_switchdev_notifier(&ethsw->port_switchdev_nb);
 err_switchdev_nb:
        unregister_netdevice_notifier(&ethsw->port_nb);
        return err;
@@ -1499,7 +1496,7 @@ static void ethsw_unregister_notifier(struct device *dev)
                dev_err(dev,
                        "Failed to unregister switchdev blocking notifier (%d)\n", err);
 
-       err = unregister_switchdev_notifier(&port_switchdev_nb);
+       err = unregister_switchdev_notifier(&ethsw->port_switchdev_nb);
        if (err)
                dev_err(dev,
                        "Failed to unregister switchdev notifier (%d)\n", err);

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index 39a3f542c8eea6ec155c5a8108c30941ad4f521e..e050589758b151a83db24d34343f3c2e8c82e5e7 100644 (file)
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
@@ -68,6 +68,7 @@ struct ethsw_core {
        bool                            learning;
 
        struct notifier_block           port_nb;
+       struct notifier_block           port_switchdev_nb;
 };
 
 #endif /* __ETHSW_H */