[net-next] net: lan966x: Change lan966x_police_del return type

Message ID 20230312195155.1492881-1-horatiu.vultur@microchip.com
State New
Headers
Series [net-next] net: lan966x: Change lan966x_police_del return type |

Commit Message

Horatiu Vultur March 12, 2023, 7:51 p.m. UTC
  As the function always returns 0 change the return type to be
void instead of int. In this way also remove a wrong message
in case of error which would never happen.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
---
 .../net/ethernet/microchip/lan966x/lan966x_police.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
  

Comments

Alvin Šipraga March 12, 2023, 8:29 p.m. UTC | #1
On Sun, Mar 12, 2023 at 08:51:55PM +0100, Horatiu Vultur wrote:
> As the function always returns 0 change the return type to be
> void instead of int. In this way also remove a wrong message
> in case of error which would never happen.
> 
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
> ---

Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>
  
Simon Horman March 13, 2023, 7:01 p.m. UTC | #2
On Sun, Mar 12, 2023 at 08:51:55PM +0100, Horatiu Vultur wrote:
> As the function always returns 0 change the return type to be
> void instead of int. In this way also remove a wrong message
> in case of error which would never happen.
> 
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>

Reviewed-by: Simon Horman <simon.horman@corigine.com>
  
patchwork-bot+netdevbpf@kernel.org March 15, 2023, 7:30 a.m. UTC | #3
Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Sun, 12 Mar 2023 20:51:55 +0100 you wrote:
> As the function always returns 0 change the return type to be
> void instead of int. In this way also remove a wrong message
> in case of error which would never happen.
> 
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
> ---
>  .../net/ethernet/microchip/lan966x/lan966x_police.c | 13 ++-----------
>  1 file changed, 2 insertions(+), 11 deletions(-)

Here is the summary with links:
  - [net-next] net: lan966x: Change lan966x_police_del return type
    https://git.kernel.org/netdev/net-next/c/68a84a127bb0

You are awesome, thank you!
  

Patch

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_police.c b/drivers/net/ethernet/microchip/lan966x/lan966x_police.c
index 7d66fe75cd3bf..7302df2300fd2 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_police.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_police.c
@@ -49,8 +49,7 @@  static int lan966x_police_add(struct lan966x_port *port,
 	return 0;
 }
 
-static int lan966x_police_del(struct lan966x_port *port,
-			      u16 pol_idx)
+static void lan966x_police_del(struct lan966x_port *port, u16 pol_idx)
 {
 	struct lan966x *lan966x = port->lan966x;
 
@@ -67,8 +66,6 @@  static int lan966x_police_del(struct lan966x_port *port,
 	lan_wr(ANA_POL_PIR_CFG_PIR_RATE_SET(GENMASK(14, 0)) |
 	       ANA_POL_PIR_CFG_PIR_BURST_SET(0),
 	       lan966x, ANA_POL_PIR_CFG(pol_idx));
-
-	return 0;
 }
 
 static int lan966x_police_validate(struct lan966x_port *port,
@@ -186,7 +183,6 @@  int lan966x_police_port_del(struct lan966x_port *port,
 			    struct netlink_ext_ack *extack)
 {
 	struct lan966x *lan966x = port->lan966x;
-	int err;
 
 	if (port->tc.police_id != police_id) {
 		NL_SET_ERR_MSG_MOD(extack,
@@ -194,12 +190,7 @@  int lan966x_police_port_del(struct lan966x_port *port,
 		return -EINVAL;
 	}
 
-	err = lan966x_police_del(port, POL_IDX_PORT + port->chip_port);
-	if (err) {
-		NL_SET_ERR_MSG_MOD(extack,
-				   "Failed to add policer to port");
-		return err;
-	}
+	lan966x_police_del(port, POL_IDX_PORT + port->chip_port);
 
 	lan_rmw(ANA_POL_CFG_PORT_POL_ENA_SET(0) |
 		ANA_POL_CFG_POL_ORDER_SET(POL_ORDER),