| Message ID | 20200921131044.92430-1-miaoqinglang@huawei.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | [-next] net/mlx5: simplify the return expression of mlx5_ec_init() | expand |
On Mon, 2020-09-21 at 21:10 +0800, Qinglang Miao wrote: > Simplify the return expression. > > Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > Applied to net-next-mlx5. Thanks.
On Mon, 21 Sep 2020 22:52:30 -0700 Saeed Mahameed wrote: > On Mon, 2020-09-21 at 21:10 +0800, Qinglang Miao wrote: > > Simplify the return expression. > > > > Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> > > --- > > drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 6 +----- > > 1 file changed, 1 insertion(+), 5 deletions(-) > > > > > > Applied to net-next-mlx5. Beware: drivers/net/ethernet/mellanox/mlx5/core/ecpf.c: In function ‘mlx5_ec_init’: drivers/net/ethernet/mellanox/mlx5/core/ecpf.c:46:6: warning: unused variable ‘err’ [-Wunused-variable] 46 | int err = 0; | ^~~
On Tue, 2020-09-22 at 08:04 -0700, Jakub Kicinski wrote: > On Mon, 21 Sep 2020 22:52:30 -0700 Saeed Mahameed wrote: > > On Mon, 2020-09-21 at 21:10 +0800, Qinglang Miao wrote: > > > Simplify the return expression. > > > > > > Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> > > > --- > > > drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 6 +----- > > > 1 file changed, 1 insertion(+), 5 deletions(-) > > > > > > > > > > Applied to net-next-mlx5. > > Beware: > > drivers/net/ethernet/mellanox/mlx5/core/ecpf.c: In function > ‘mlx5_ec_init’: > drivers/net/ethernet/mellanox/mlx5/core/ecpf.c:46:6: warning: unused > variable ‘err’ [-Wunused-variable] > 46 | int err = 0; > | ^~~ Thanks Jakub Yes, Saw this in my CI as well, will resolve this one myself. and for next time I will wait for the CI result before replying ;)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c b/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c index a894ea98c..fa05b4657 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c @@ -51,11 +51,7 @@ int mlx5_ec_init(struct mlx5_core_dev *dev) /* ECPF shall enable HCA for peer PF in the same way a PF * does this for its VFs. */ - err = mlx5_peer_pf_init(dev); - if (err) - return err; - - return 0; + return mlx5_peer_pf_init(dev); } void mlx5_ec_cleanup(struct mlx5_core_dev *dev)
Simplify the return expression. Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> --- drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)