]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net/mlx5: Align ODP capability function with netdev coding style
authorLeon Romanovsky <leonro@mellanox.com>
Mon, 11 Feb 2019 11:56:07 +0000 (13:56 +0200)
committerLeon Romanovsky <leonro@mellanox.com>
Wed, 13 Feb 2019 17:50:48 +0000 (19:50 +0200)
Update newly introduced function to be aligned to netdev coding style.

Fixes: 46861e3e88be ("net/mlx5: Set ODP SRQ support in firmware")
Reported-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/main.c

index e38aa206ab6d74ebd5756b867541222c67dd6e77..6d45518edbdc4063d02c9aabcc9e3d69fe5bd82b 100644 (file)
@@ -461,9 +461,9 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev *dev)
 
 static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
 {
-       void *set_ctx;
        void *set_hca_cap;
-       int set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
+       void *set_ctx;
+       int set_sz;
        int err;
 
        if (!MLX5_CAP_GEN(dev, pg))
@@ -473,15 +473,12 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
        if (err)
                return err;
 
-       /**
-        * If all bits are cleared we shouldn't try to set it
-        * or we might fail while trying to access a reserved bit.
-        */
        if (!(MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive) ||
              MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive) ||
              MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive)))
                return 0;
 
+       set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
        set_ctx = kzalloc(set_sz, GFP_KERNEL);
        if (!set_ctx)
                return -ENOMEM;
@@ -492,13 +489,13 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
 
        /* set ODP SRQ support for RC/UD and XRC transports */
        MLX5_SET(odp_cap, set_hca_cap, ud_odp_caps.srq_receive,
-                (MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive)));
+                MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive));
 
        MLX5_SET(odp_cap, set_hca_cap, rc_odp_caps.srq_receive,
-                (MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive)));
+                MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive));
 
        MLX5_SET(odp_cap, set_hca_cap, xrc_odp_caps.srq_receive,
-                (MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive)));
+                MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive));
 
        err = set_caps(dev, set_ctx, set_sz, MLX5_SET_HCA_CAP_OP_MOD_ODP);