[patch net-next 0/3] net: devlink: couple of trivial fixes

[patch net-next 0/3] net: devlink: couple of trivial fixes

[Jiri Pirko]

From: Jiri Pirko <jiri@nvidia.com>

Just a couple of trivial fixes I found on the way.

Jiri Pirko (3):
  net: devlink: make devlink_dpipe_headers_register() return void
  net: devlink: fix a typo in function name devlink_port_new_notifiy()
  net: devlink: fix return statement in devlink_port_new_notify()

 .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c |  6 ++----
 include/net/devlink.h                            |  2 +-
 net/core/devlink.c                               | 16 +++++++---------
 3 files changed, 10 insertions(+), 14 deletions(-)

-- 
2.35.3

[patch net-next 1/3] net: devlink: make devlink_dpipe_headers_register() return void

[Jiri Pirko]

From: Jiri Pirko <jiri@nvidia.com>

The return value is not used, so change the return value type to void.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 6 ++----
 include/net/devlink.h                                | 2 +-
 net/core/devlink.c                                   | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
index 5d494fabf93d..c2540292702d 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
@@ -1266,10 +1266,8 @@ int mlxsw_sp_dpipe_init(struct mlxsw_sp *mlxsw_sp)
 	struct devlink *devlink = priv_to_devlink(mlxsw_sp->core);
 	int err;
 
-	err = devlink_dpipe_headers_register(devlink,
-					     &mlxsw_sp_dpipe_headers);
-	if (err)
-		return err;
+	devlink_dpipe_headers_register(devlink, &mlxsw_sp_dpipe_headers);
+
 	err = mlxsw_sp_dpipe_erif_table_init(mlxsw_sp);
 	if (err)
 		goto err_erif_table_init;
diff --git a/include/net/devlink.h b/include/net/devlink.h
index b1b5c19a8316..88c701b375a2 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1590,7 +1590,7 @@ int devlink_dpipe_table_register(struct devlink *devlink,
 				 void *priv, bool counter_control_extern);
 void devlink_dpipe_table_unregister(struct devlink *devlink,
 				    const char *table_name);
-int devlink_dpipe_headers_register(struct devlink *devlink,
+void devlink_dpipe_headers_register(struct devlink *devlink,
 				   struct devlink_dpipe_headers *dpipe_headers);
 void devlink_dpipe_headers_unregister(struct devlink *devlink);
 bool devlink_dpipe_table_counter_enabled(struct devlink *devlink,
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 2b2e454ebd78..c261bba9ab76 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -10425,13 +10425,12 @@ EXPORT_SYMBOL_GPL(devlink_sb_unregister);
  *
  *	Register the headers supported by hardware.
  */
-int devlink_dpipe_headers_register(struct devlink *devlink,
-				   struct devlink_dpipe_headers *dpipe_headers)
+void devlink_dpipe_headers_register(struct devlink *devlink,
+				    struct devlink_dpipe_headers *dpipe_headers)
 {
 	devl_lock(devlink);
 	devlink->dpipe_headers = dpipe_headers;
 	devl_unlock(devlink);
-	return 0;
 }
 EXPORT_SYMBOL_GPL(devlink_dpipe_headers_register);
 
-- 
2.35.3

[patch net-next 2/3] net: devlink: fix a typo in function name devlink_port_new_notifiy()

[Jiri Pirko]

From: Jiri Pirko <jiri@nvidia.com>

Fix the typo in a name of devlink_port_new_notifiy() function.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
 net/core/devlink.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index c261bba9ab76..2f22ce33c3ec 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1700,9 +1700,9 @@ static int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,
 	return devlink->ops->port_unsplit(devlink, devlink_port, info->extack);
 }
 
-static int devlink_port_new_notifiy(struct devlink *devlink,
-				    unsigned int port_index,
-				    struct genl_info *info)
+static int devlink_port_new_notify(struct devlink *devlink,
+				   unsigned int port_index,
+				   struct genl_info *info)
 {
 	struct devlink_port *devlink_port;
 	struct sk_buff *msg;
@@ -1775,7 +1775,7 @@ static int devlink_nl_cmd_port_new_doit(struct sk_buff *skb,
 	if (err)
 		return err;
 
-	err = devlink_port_new_notifiy(devlink, new_port_index, info);
+	err = devlink_port_new_notify(devlink, new_port_index, info);
 	if (err && err != -ENODEV) {
 		/* Fail to send the response; destroy newly created port. */
 		devlink->ops->port_del(devlink, new_port_index, extack);
-- 
2.35.3

[patch net-next 3/3] net: devlink: fix return statement in devlink_port_new_notify()

[Jiri Pirko]

From: Jiri Pirko <jiri@nvidia.com>

Return directly without intermediate value store at the end of
devlink_port_new_notify() function.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
 net/core/devlink.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 2f22ce33c3ec..a9776ea923ae 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1724,8 +1724,7 @@ static int devlink_port_new_notify(struct devlink *devlink,
 	if (err)
 		goto out;
 
-	err = genlmsg_reply(msg, info);
-	return err;
+	return genlmsg_reply(msg, info);
 
 out:
 	nlmsg_free(msg);
-- 
2.35.3

Re: [patch net-next 0/3] net: devlink: couple of trivial fixes

[Jakub Kicinski]

On Tue, 12 Jul 2022 12:48:50 +0200 Jiri Pirko wrote:
> Just a couple of trivial fixes I found on the way.

Acked-by: Jakub Kicinski <kuba@kernel.org>

Re: [patch net-next 0/3] net: devlink: couple of trivial fixes

[Jiri Pirko]

Guys, this is incorrectly marked as "Changes Requested" in patchwork,
however I got ack from Jakub and no changes were requested.
Could you apply, or should I re-send?

Thanks!


Tue, Jul 12, 2022 at 12:48:50PM CEST, jiri@resnulli.us wrote:
>From: Jiri Pirko <jiri@nvidia.com>
>
>Just a couple of trivial fixes I found on the way.
>
>Jiri Pirko (3):
>  net: devlink: make devlink_dpipe_headers_register() return void
>  net: devlink: fix a typo in function name devlink_port_new_notifiy()
>  net: devlink: fix return statement in devlink_port_new_notify()
>
> .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c |  6 ++----
> include/net/devlink.h                            |  2 +-
> net/core/devlink.c                               | 16 +++++++---------
> 3 files changed, 10 insertions(+), 14 deletions(-)
>
>-- 
>2.35.3
>

Re: [patch net-next 0/3] net: devlink: couple of trivial fixes

[Jiri Pirko]

Wed, Jul 13, 2022 at 04:03:17PM CEST, jiri@resnulli.us wrote:
>Guys, this is incorrectly marked as "Changes Requested" in patchwork,
>however I got ack from Jakub and no changes were requested.
>Could you apply, or should I re-send?

I see, the previous patchset was not applied when robot tried to apply
this, and the apply failed. Will repost, sorry for fuzz.

>
>Thanks!
>
>
>Tue, Jul 12, 2022 at 12:48:50PM CEST, jiri@resnulli.us wrote:
>>From: Jiri Pirko <jiri@nvidia.com>
>>
>>Just a couple of trivial fixes I found on the way.
>>
>>Jiri Pirko (3):
>>  net: devlink: make devlink_dpipe_headers_register() return void
>>  net: devlink: fix a typo in function name devlink_port_new_notifiy()
>>  net: devlink: fix return statement in devlink_port_new_notify()
>>
>> .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c |  6 ++----
>> include/net/devlink.h                            |  2 +-
>> net/core/devlink.c                               | 16 +++++++---------
>> 3 files changed, 10 insertions(+), 14 deletions(-)
>>
>>-- 
>>2.35.3
>>