leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ioana Ciornei 2019-11-11 18:50:57 +02:00 committed by Greg Kroah-Hartman
parent a3c6345e9f
commit 910f30917c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/fsl-dpaa2/ethsw/ethsw.c
View File

@ -1314,10 +1314,6 @@ static int port_switchdev_blocking_event(struct notifier_block *unused,
return NOTIFY_DONE; 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) static int ethsw_register_notifier(struct device *dev)
{ {
struct ethsw_core *ethsw = dev_get_drvdata(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; 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) { if (err) {
dev_err(dev, "Failed to register switchdev blocking notifier\n"); dev_err(dev, "Failed to register switchdev blocking notifier\n");
goto err_switchdev_blocking_nb; goto err_switchdev_blocking_nb;
@ -1490,7 +1487,7 @@ static void ethsw_unregister_notifier(struct device *dev)
struct notifier_block *nb; struct notifier_block *nb;
int err; int err;
nb = &port_switchdev_blocking_nb; nb = &ethsw->port_switchdevb_nb;
err = unregister_switchdev_blocking_notifier(nb); err = unregister_switchdev_blocking_notifier(nb);
if (err) if (err)
dev_err(dev, dev_err(dev,

1
drivers/staging/fsl-dpaa2/ethsw/ethsw.h
View File

@ -69,6 +69,7 @@ struct ethsw_core {
struct notifier_block port_nb; struct notifier_block port_nb;
struct notifier_block port_switchdev_nb; struct notifier_block port_switchdev_nb;
struct notifier_block port_switchdevb_nb;
}; };
#endif /* __ETHSW_H */ #endif /* __ETHSW_H */