Commit 21ce2c12 authored by Alexandru Tachici's avatar Alexandru Tachici Committed by Jakub Kicinski

net: ethernet: adi: adin1110: Fix notifiers

ADIN1110 was registering netdev_notifiers on each device probe.
This leads to warnings/probe failures because of double registration
of the same notifier when to adin1110/2111 devices are connected to
the same system.

Move the registration of netdev_notifiers in module init call,
in this way multiple driver instances can use the same notifiers.

Fixes: bc93e19d ("net: ethernet: adi: Add ADIN1110 support")
Signed-off-by: default avatarAlexandru Tachici <alexandru.tachici@analog.com>
Link: https://lore.kernel.org/r/20221027095655.89890-2-alexandru.tachici@analog.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9201f60a
...@@ -1512,16 +1512,15 @@ static struct notifier_block adin1110_switchdev_notifier = { ...@@ -1512,16 +1512,15 @@ static struct notifier_block adin1110_switchdev_notifier = {
.notifier_call = adin1110_switchdev_event, .notifier_call = adin1110_switchdev_event,
}; };
static void adin1110_unregister_notifiers(void *data) static void adin1110_unregister_notifiers(void)
{ {
unregister_switchdev_blocking_notifier(&adin1110_switchdev_blocking_notifier); unregister_switchdev_blocking_notifier(&adin1110_switchdev_blocking_notifier);
unregister_switchdev_notifier(&adin1110_switchdev_notifier); unregister_switchdev_notifier(&adin1110_switchdev_notifier);
unregister_netdevice_notifier(&adin1110_netdevice_nb); unregister_netdevice_notifier(&adin1110_netdevice_nb);
} }
static int adin1110_setup_notifiers(struct adin1110_priv *priv) static int adin1110_setup_notifiers(void)
{ {
struct device *dev = &priv->spidev->dev;
int ret; int ret;
ret = register_netdevice_notifier(&adin1110_netdevice_nb); ret = register_netdevice_notifier(&adin1110_netdevice_nb);
...@@ -1536,13 +1535,14 @@ static int adin1110_setup_notifiers(struct adin1110_priv *priv) ...@@ -1536,13 +1535,14 @@ static int adin1110_setup_notifiers(struct adin1110_priv *priv)
if (ret < 0) if (ret < 0)
goto err_sdev; goto err_sdev;
return devm_add_action_or_reset(dev, adin1110_unregister_notifiers, NULL); return 0;
err_sdev: err_sdev:
unregister_switchdev_notifier(&adin1110_switchdev_notifier); unregister_switchdev_notifier(&adin1110_switchdev_notifier);
err_netdev: err_netdev:
unregister_netdevice_notifier(&adin1110_netdevice_nb); unregister_netdevice_notifier(&adin1110_netdevice_nb);
return ret; return ret;
} }
...@@ -1613,10 +1613,6 @@ static int adin1110_probe_netdevs(struct adin1110_priv *priv) ...@@ -1613,10 +1613,6 @@ static int adin1110_probe_netdevs(struct adin1110_priv *priv)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = adin1110_setup_notifiers(priv);
if (ret < 0)
return ret;
for (i = 0; i < priv->cfg->ports_nr; i++) { for (i = 0; i < priv->cfg->ports_nr; i++) {
ret = devm_register_netdev(dev, priv->ports[i]->netdev); ret = devm_register_netdev(dev, priv->ports[i]->netdev);
if (ret < 0) { if (ret < 0) {
...@@ -1693,7 +1689,31 @@ static struct spi_driver adin1110_driver = { ...@@ -1693,7 +1689,31 @@ static struct spi_driver adin1110_driver = {
.probe = adin1110_probe, .probe = adin1110_probe,
.id_table = adin1110_spi_id, .id_table = adin1110_spi_id,
}; };
module_spi_driver(adin1110_driver);
static int __init adin1110_driver_init(void)
{
int ret;
ret = adin1110_setup_notifiers();
if (ret < 0)
return ret;
ret = spi_register_driver(&adin1110_driver);
if (ret < 0) {
adin1110_unregister_notifiers();
return ret;
}
return 0;
}
static void __exit adin1110_exit(void)
{
adin1110_unregister_notifiers();
spi_unregister_driver(&adin1110_driver);
}
module_init(adin1110_driver_init);
module_exit(adin1110_exit);
MODULE_DESCRIPTION("ADIN1110 Network driver"); MODULE_DESCRIPTION("ADIN1110 Network driver");
MODULE_AUTHOR("Alexandru Tachici <alexandru.tachici@analog.com>"); MODULE_AUTHOR("Alexandru Tachici <alexandru.tachici@analog.com>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment