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

Register a different switchdev blocking 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-4-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 abbfcbf812415c8132a49b5d90e1faca39105385..37ee9b0aa326ee24fe888c81b719a4cc1b3d75c5 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_blocking_nb = {
-       .notifier_call = port_switchdev_blocking_event,
-};
-
 static int ethsw_register_notifier(struct device *dev)
 {
        struct ethsw_core *ethsw = dev_get_drvdata(dev);
@@ -1337,7 +1333,8 @@ static int ethsw_register_notifier(struct device *dev)
                goto err_switchdev_nb;
        }
 
-       err = register_switchdev_blocking_notifier(&port_switchdev_blocking_nb);
+       ethsw->port_switchdevb_nb.notifier_call = port_switchdev_blocking_event;
+       err = register_switchdev_blocking_notifier(&ethsw->port_switchdevb_nb);
        if (err) {
                dev_err(dev, "Failed to register switchdev blocking notifier\n");
                goto err_switchdev_blocking_nb;
@@ -1490,7 +1487,7 @@ static void ethsw_unregister_notifier(struct device *dev)
        struct notifier_block *nb;
        int err;
 
-       nb = &port_switchdev_blocking_nb;
+       nb = &ethsw->port_switchdevb_nb;
        err = unregister_switchdev_blocking_notifier(nb);
        if (err)
                dev_err(dev,

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