diff mbox series

[net-next] net: microchip: sparx5: remove useless code in sparx5_qos_init()

Message ID 20221117145820.2898968-1-luwei32@huawei.com
State New
Headers
Series [net-next] net: microchip: sparx5: remove useless code in sparx5_qos_init() |

Commit Message

Lu Wei Nov. 17, 2022, 2:58 p.m. UTC 
  There is no need to define variable ret, so remove it
and return sparx5_leak_groups_init() directly.

Signed-off-by: Lu Wei <luwei32@huawei.com>
---
 drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Comments

Andrew Lunn Nov. 17, 2022, 2:08 p.m. UTC | #1 
On Thu, Nov 17, 2022 at 10:58:20PM +0800, Lu Wei wrote:
> There is no need to define variable ret, so remove it
> and return sparx5_leak_groups_init() directly.
> 
> Signed-off-by: Lu Wei <luwei32@huawei.com>
> ---
>  drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
> index 1e79d0ef0cb8..2f39300d52cc 100644
> --- a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
> +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
> @@ -383,13 +383,7 @@ static int sparx5_leak_groups_init(struct sparx5 *sparx5)
>  
>  int sparx5_qos_init(struct sparx5 *sparx5)
>  {
> -	int ret;
> -
> -	ret = sparx5_leak_groups_init(sparx5);
> -	if (ret < 0)
> -		return ret;
> -
> -	return 0;
> +	return sparx5_leak_groups_init(sparx5);
>  }

Does sparx5_qos_init() even make sense given that all it does it call
a function?

Please don't do the minimum needed to make your robot happy. Think
about the code, the change, is this the best fix?

      Andrew
Daniel Machon Nov. 17, 2022, 2:21 p.m. UTC | #2 
Den Thu, Nov 17, 2022 at 10:58:20PM +0800 skrev Lu Wei:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> There is no need to define variable ret, so remove it
> and return sparx5_leak_groups_init() directly.
> 
> Signed-off-by: Lu Wei <luwei32@huawei.com>
> ---
>  drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
> index 1e79d0ef0cb8..2f39300d52cc 100644
> --- a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
> +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
> @@ -383,13 +383,7 @@ static int sparx5_leak_groups_init(struct sparx5 *sparx5)
> 
>  int sparx5_qos_init(struct sparx5 *sparx5)
>  {
> -       int ret;
> -
> -       ret = sparx5_leak_groups_init(sparx5);
> -       if (ret < 0)
> -               return ret;
> -
> -       return 0;
> +       return sparx5_leak_groups_init(sparx5);
>  }
> 
>  int sparx5_tc_mqprio_add(struct net_device *ndev, u8 num_tc)
> --
> 2.31.1
>

sparx5_qos_init() will be expanded in later patch series, as new QoS
features require new initializations - so this is actually somewhat
intentional.

/ Daniel
Andrew Lunn Nov. 17, 2022, 8:14 p.m. UTC | #3 
> sparx5_qos_init() will be expanded in later patch series, as new QoS
> features require new initializations - so this is actually somewhat
> intentional.

When do you expect such patches to land?

If it going to be soon, we can keep the code as it is. If it is going
to be a while, the bots are going to keep finding this and what to
remove it.

     Andrew
Daniel Machon Nov. 18, 2022, 8:47 a.m. UTC | #4 
Den Thu, Nov 17, 2022 at 09:14:38PM +0100 skrev Andrew Lunn:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> > sparx5_qos_init() will be expanded in later patch series, as new QoS
> > features require new initializations - so this is actually somewhat
> > intentional.
> 
> When do you expect such patches to land?

Most likely sometime in the next window.

> 
> If it going to be soon, we can keep the code as it is. If it is going
> to be a while, the bots are going to keep finding this and what to
> remove it.

I see. If bots will be bugging us regularly, then it might just be best
to let the patch through.

> 
>      Andrew

/ Daniel
diff mbox series

Patch

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
index 1e79d0ef0cb8..2f39300d52cc 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
@@ -383,13 +383,7 @@  static int sparx5_leak_groups_init(struct sparx5 *sparx5)
 
 int sparx5_qos_init(struct sparx5 *sparx5)
 {
-	int ret;
-
-	ret = sparx5_leak_groups_init(sparx5);
-	if (ret < 0)
-		return ret;
-
-	return 0;
+	return sparx5_leak_groups_init(sparx5);
 }
 
 int sparx5_tc_mqprio_add(struct net_device *ndev, u8 num_tc)