diff options
| author | Leon Romanovsky <leonro@nvidia.com> | 2021-09-22 11:58:03 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-09-22 14:15:12 +0100 |
| commit | db4278c55fa53760893266538e86e638330b03bb (patch) | |
| tree | c2b028bf752e268e9a85791aa199db4f559b80be /net | |
| parent | 07b855628c226511542d0911cba1b180541fbb84 (diff) | |
| download | linux-db4278c55fa53760893266538e86e638330b03bb.tar.gz | |
devlink: Make devlink_register to be void
devlink_register() can't fail and always returns success, but all drivers are obligated to check returned status anyway. This adds a lot of boilerplate code to handle impossible flow. Make devlink_register() void and simplify the drivers that use that API call. Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Acked-by: Simon Horman <simon.horman@corigine.com> Acked-by: Vladimir Oltean <olteanv@gmail.com> # dsa Reviewed-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/devlink.c | 3 | ||||
| -rw-r--r-- | net/dsa/dsa2.c | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 0f1663453ca0..7d975057c2a9 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -8960,13 +8960,12 @@ EXPORT_SYMBOL_GPL(devlink_alloc_ns); * * @devlink: devlink */ -int devlink_register(struct devlink *devlink) +void devlink_register(struct devlink *devlink) { mutex_lock(&devlink_mutex); xa_set_mark(&devlinks, devlink->index, DEVLINK_REGISTERED); devlink_notify(devlink, DEVLINK_CMD_NEW); mutex_unlock(&devlink_mutex); - return 0; } EXPORT_SYMBOL_GPL(devlink_register); diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index eef13cd20f19..96f211f52ac3 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -804,10 +804,7 @@ static int dsa_switch_setup(struct dsa_switch *ds) dl_priv = devlink_priv(ds->devlink); dl_priv->ds = ds; - err = devlink_register(ds->devlink); - if (err) - goto free_devlink; - + devlink_register(ds->devlink); /* Setup devlink port instances now, so that the switch * setup() can register regions etc, against the ports */ @@ -863,10 +860,8 @@ unregister_devlink_ports: if (dp->ds == ds) dsa_port_devlink_teardown(dp); devlink_unregister(ds->devlink); -free_devlink: devlink_free(ds->devlink); ds->devlink = NULL; - return err; } |