Commit 910f3091 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Greg Kroah-Hartman
Browse files

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: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Link: https://lore.kernel.org/r/1573491058-24766-4-git-send-email-ioana.ciornei@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3c6345e

drivers/staging/fsl-dpaa2/ethsw/ethsw.c

+3 −6
Original line number Diff line number Diff line
@@ -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,

drivers/staging/fsl-dpaa2/ethsw/ethsw.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE