| Message ID | 1568307542-43797-1-git-send-email-zhongjiang@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | net/mlx5: Remove unneeded variable in mlx5_unload_one | expand |
On Fri, 2019-09-13 at 00:59 +0800, zhong jiang wrote: > mlx5_unload_one do not need local variable to store different value, > Hence just remove it. > > Signed-off-by: zhong jiang <zhongjiang@huawei.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c > b/drivers/net/ethernet/mellanox/mlx5/core/main.c > index 9648c22..c39bb37 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c > @@ -1228,8 +1228,6 @@ static int mlx5_load_one(struct mlx5_core_dev > *dev, bool boot) > > static int mlx5_unload_one(struct mlx5_core_dev *dev, bool cleanup) > { > - int err = 0; > - > if (cleanup) { > mlx5_unregister_device(dev); > mlx5_drain_health_wq(dev); > @@ -1257,7 +1255,7 @@ static int mlx5_unload_one(struct mlx5_core_dev > *dev, bool cleanup) > mlx5_function_teardown(dev, cleanup); > out: > mutex_unlock(&dev->intf_state_mutex); > - return err; > + return 0; > } > > static int mlx5_mdev_init(struct mlx5_core_dev *dev, int > profile_idx) Acked-by: Saeed Mahameed <saeedm@mellanox.com>
From: zhong jiang <zhongjiang@huawei.com> Date: Fri, 13 Sep 2019 00:59:02 +0800 > mlx5_unload_one do not need local variable to store different value, > Hence just remove it. > > Signed-off-by: zhong jiang <zhongjiang@huawei.com> Saeed, just take this directly via one of your trees. Thank you.
On Sun, 2019-09-15 at 19:53 +0100, David Miller wrote: > From: zhong jiang <zhongjiang@huawei.com> > Date: Fri, 13 Sep 2019 00:59:02 +0800 > > > mlx5_unload_one do not need local variable to store different > value, > > Hence just remove it. > > > > Signed-off-by: zhong jiang <zhongjiang@huawei.com> > > Saeed, just take this directly via one of your trees. > Applied to net-next-mlx5. Thanks, Saeed.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 9648c22..c39bb37 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1228,8 +1228,6 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, bool boot) static int mlx5_unload_one(struct mlx5_core_dev *dev, bool cleanup) { - int err = 0; - if (cleanup) { mlx5_unregister_device(dev); mlx5_drain_health_wq(dev); @@ -1257,7 +1255,7 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, bool cleanup) mlx5_function_teardown(dev, cleanup); out: mutex_unlock(&dev->intf_state_mutex); - return err; + return 0; } static int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx)
mlx5_unload_one do not need local variable to store different value, Hence just remove it. Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)