diff mbox

[1/1] mlx4_en: remove unnecessary error check

Message ID 1500884564-310-1-git-send-email-yanjun.zhu@oracle.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Zhu Yanjun July 24, 2017, 8:22 a.m. UTC
The function mlx4_en_get_profile always return zero. So it is not
necessary to check its return value.

CC: Joe Jin <joe.jin@oracle.com>
CC: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
---
 drivers/net/ethernet/mellanox/mlx4/en_main.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Tariq Toukan July 24, 2017, 1:01 p.m. UTC | #1
On 24/07/2017 11:22 AM, Zhu Yanjun wrote:
> The function mlx4_en_get_profile always return zero. So it is not
> necessary to check its return value.
> 
> CC: Joe Jin <joe.jin@oracle.com>
> CC: Junxiao Bi <junxiao.bi@oracle.com>
> Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
> ---
>   drivers/net/ethernet/mellanox/mlx4/en_main.c | 9 ++-------
>   1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
> index 2b0cbca..686e18d 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
> @@ -147,7 +147,7 @@ void mlx4_en_update_loopback_state(struct net_device *dev,
>   	mutex_unlock(&priv->mdev->state_lock);
>   }
>   
> -static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
> +static void mlx4_en_get_profile(struct mlx4_en_dev *mdev)
>   {
>   	struct mlx4_en_profile *params = &mdev->profile;
>   	int i;
> @@ -176,8 +176,6 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
>   		params->prof[i].rss_rings = 0;
>   		params->prof[i].inline_thold = inline_thold;
>   	}
> -
> -	return 0;
>   }
>   
>   static void *mlx4_en_get_netdev(struct mlx4_dev *dev, void *ctx, u8 port)
> @@ -309,10 +307,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
>   	}
>   
>   	/* Build device profile according to supplied module parameters */
> -	if (mlx4_en_get_profile(mdev)) {
> -		mlx4_err(mdev, "Bad module parameters, aborting\n");
> -		goto err_mr;
> -	}
> +	mlx4_en_get_profile(mdev);
>   
>   	/* Configure which ports to start according to module parameters */
>   	mdev->port_cnt = 0;
> 
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>

Thank you Zhu.
David Miller July 25, 2017, 12:26 a.m. UTC | #2
From: Zhu Yanjun <yanjun.zhu@oracle.com>
Date: Mon, 24 Jul 2017 04:22:44 -0400

> The function mlx4_en_get_profile always return zero. So it is not
> necessary to check its return value.
> 
> CC: Joe Jin <joe.jin@oracle.com>
> CC: Junxiao Bi <junxiao.bi@oracle.com>
> Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>

Applied, thanks.
diff mbox

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 2b0cbca..686e18d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -147,7 +147,7 @@  void mlx4_en_update_loopback_state(struct net_device *dev,
 	mutex_unlock(&priv->mdev->state_lock);
 }
 
-static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
+static void mlx4_en_get_profile(struct mlx4_en_dev *mdev)
 {
 	struct mlx4_en_profile *params = &mdev->profile;
 	int i;
@@ -176,8 +176,6 @@  static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
 		params->prof[i].rss_rings = 0;
 		params->prof[i].inline_thold = inline_thold;
 	}
-
-	return 0;
 }
 
 static void *mlx4_en_get_netdev(struct mlx4_dev *dev, void *ctx, u8 port)
@@ -309,10 +307,7 @@  static void *mlx4_en_add(struct mlx4_dev *dev)
 	}
 
 	/* Build device profile according to supplied module parameters */
-	if (mlx4_en_get_profile(mdev)) {
-		mlx4_err(mdev, "Bad module parameters, aborting\n");
-		goto err_mr;
-	}
+	mlx4_en_get_profile(mdev);
 
 	/* Configure which ports to start according to module parameters */
 	mdev->port_cnt = 0;