]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net: qed: improve indentation of some parts of code
authorAlexander Lobakin <alobakin@marvell.com>
Mon, 6 Jul 2020 15:38:17 +0000 (18:38 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jul 2020 20:18:55 +0000 (13:18 -0700)
To not mix functional and stylistic changes, correct indentation
of code that will be modified in the subsequent commits.

Signed-off-by: Alexander Lobakin <alobakin@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qlogic/qed/qed_cxt.c
drivers/net/ethernet/qlogic/qed/qed_debug.c
drivers/net/ethernet/qlogic/qed/qed_hsi.h
drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c
drivers/net/ethernet/qlogic/qed/qed_iscsi.c
drivers/net/ethernet/qlogic/qed/qed_iwarp.c
drivers/net/ethernet/qlogic/qed/qed_roce.c
drivers/net/ethernet/qlogic/qed/qed_sp.h
drivers/net/ethernet/qlogic/qed/qed_sriov.c

index e72d25854d79b1035e9e3b35e490c449ad97a4c1..e3fe982532d5d876c85364e8af73248351ecba23 100644 (file)
@@ -73,8 +73,8 @@ union type1_task_context {
 };
 
 struct src_ent {
-       u8 opaque[56];
-       u64 next;
+       u8                              opaque[56];
+       u64                             next;
 };
 
 #define CDUT_SEG_ALIGNMET              3 /* in 4k chunks */
index 45cbe1c87106b9a22dc24bd77b5a1ac5a64d4de1..f856bb9a3897887092dad670a9d1573a60049837 100644 (file)
@@ -1122,9 +1122,8 @@ static u32 qed_dump_fw_ver_param(struct qed_hwfn *p_hwfn,
                                     dump, "fw-version", fw_ver_str);
        offset += qed_dump_str_param(dump_buf + offset,
                                     dump, "fw-image", fw_img_str);
-       offset += qed_dump_num_param(dump_buf + offset,
-                                    dump,
-                                    "fw-timestamp", fw_info.ver.timestamp);
+       offset += qed_dump_num_param(dump_buf + offset, dump, "fw-timestamp",
+                                    fw_info.ver.timestamp);
 
        return offset;
 }
index 1b5506c1364beec4486e82793f2010c6eec0644c..71809ff97a03d5671973774e0111b356dfa4651c 100644 (file)
@@ -2793,34 +2793,34 @@ struct fw_overlay_buf_hdr {
 
 /* init array header: raw */
 struct init_array_raw_hdr {
-       u32 data;
-#define INIT_ARRAY_RAW_HDR_TYPE_MASK   0xF
-#define INIT_ARRAY_RAW_HDR_TYPE_SHIFT  0
-#define INIT_ARRAY_RAW_HDR_PARAMS_MASK 0xFFFFFFF
-#define INIT_ARRAY_RAW_HDR_PARAMS_SHIFT        4
+       u32                                             data;
+#define INIT_ARRAY_RAW_HDR_TYPE_MASK                   0xF
+#define INIT_ARRAY_RAW_HDR_TYPE_SHIFT                  0
+#define INIT_ARRAY_RAW_HDR_PARAMS_MASK                 0xFFFFFFF
+#define INIT_ARRAY_RAW_HDR_PARAMS_SHIFT                        4
 };
 
 /* init array header: standard */
 struct init_array_standard_hdr {
-       u32 data;
-#define INIT_ARRAY_STANDARD_HDR_TYPE_MASK      0xF
-#define INIT_ARRAY_STANDARD_HDR_TYPE_SHIFT     0
-#define INIT_ARRAY_STANDARD_HDR_SIZE_MASK      0xFFFFFFF
-#define INIT_ARRAY_STANDARD_HDR_SIZE_SHIFT     4
+       u32                                             data;
+#define INIT_ARRAY_STANDARD_HDR_TYPE_MASK              0xF
+#define INIT_ARRAY_STANDARD_HDR_TYPE_SHIFT             0
+#define INIT_ARRAY_STANDARD_HDR_SIZE_MASK              0xFFFFFFF
+#define INIT_ARRAY_STANDARD_HDR_SIZE_SHIFT             4
 };
 
 /* init array header: zipped */
 struct init_array_zipped_hdr {
-       u32 data;
-#define INIT_ARRAY_ZIPPED_HDR_TYPE_MASK                0xF
-#define INIT_ARRAY_ZIPPED_HDR_TYPE_SHIFT       0
-#define INIT_ARRAY_ZIPPED_HDR_ZIPPED_SIZE_MASK 0xFFFFFFF
-#define INIT_ARRAY_ZIPPED_HDR_ZIPPED_SIZE_SHIFT        4
+       u32                                             data;
+#define INIT_ARRAY_ZIPPED_HDR_TYPE_MASK                        0xF
+#define INIT_ARRAY_ZIPPED_HDR_TYPE_SHIFT               0
+#define INIT_ARRAY_ZIPPED_HDR_ZIPPED_SIZE_MASK         0xFFFFFFF
+#define INIT_ARRAY_ZIPPED_HDR_ZIPPED_SIZE_SHIFT                4
 };
 
 /* init array header: pattern */
 struct init_array_pattern_hdr {
-       u32 data;
+       u32                                             data;
 #define INIT_ARRAY_PATTERN_HDR_TYPE_MASK               0xF
 #define INIT_ARRAY_PATTERN_HDR_TYPE_SHIFT              0
 #define INIT_ARRAY_PATTERN_HDR_PATTERN_SIZE_MASK       0xF
@@ -2831,10 +2831,10 @@ struct init_array_pattern_hdr {
 
 /* init array header union */
 union init_array_hdr {
-       struct init_array_raw_hdr raw;
-       struct init_array_standard_hdr standard;
-       struct init_array_zipped_hdr zipped;
-       struct init_array_pattern_hdr pattern;
+       struct init_array_raw_hdr                       raw;
+       struct init_array_standard_hdr                  standard;
+       struct init_array_zipped_hdr                    zipped;
+       struct init_array_pattern_hdr                   pattern;
 };
 
 /* init array types */
@@ -2847,54 +2847,54 @@ enum init_array_types {
 
 /* init operation: callback */
 struct init_callback_op {
-       u32 op_data;
-#define INIT_CALLBACK_OP_OP_MASK       0xF
-#define INIT_CALLBACK_OP_OP_SHIFT      0
-#define INIT_CALLBACK_OP_RESERVED_MASK 0xFFFFFFF
-#define INIT_CALLBACK_OP_RESERVED_SHIFT        4
-       u16 callback_id;
-       u16 block_id;
+       u32                                             op_data;
+#define INIT_CALLBACK_OP_OP_MASK                       0xF
+#define INIT_CALLBACK_OP_OP_SHIFT                      0
+#define INIT_CALLBACK_OP_RESERVED_MASK                 0xFFFFFFF
+#define INIT_CALLBACK_OP_RESERVED_SHIFT                        4
+       u16                                             callback_id;
+       u16                                             block_id;
 };
 
 /* init operation: delay */
 struct init_delay_op {
-       u32 op_data;
-#define INIT_DELAY_OP_OP_MASK          0xF
-#define INIT_DELAY_OP_OP_SHIFT         0
-#define INIT_DELAY_OP_RESERVED_MASK    0xFFFFFFF
-#define INIT_DELAY_OP_RESERVED_SHIFT   4
-       u32 delay;
+       u32                                             op_data;
+#define INIT_DELAY_OP_OP_MASK                          0xF
+#define INIT_DELAY_OP_OP_SHIFT                         0
+#define INIT_DELAY_OP_RESERVED_MASK                    0xFFFFFFF
+#define INIT_DELAY_OP_RESERVED_SHIFT                   4
+       u32                                             delay;
 };
 
 /* init operation: if_mode */
 struct init_if_mode_op {
-       u32 op_data;
-#define INIT_IF_MODE_OP_OP_MASK                        0xF
-#define INIT_IF_MODE_OP_OP_SHIFT               0
-#define INIT_IF_MODE_OP_RESERVED1_MASK         0xFFF
-#define INIT_IF_MODE_OP_RESERVED1_SHIFT                4
-#define INIT_IF_MODE_OP_CMD_OFFSET_MASK                0xFFFF
-#define INIT_IF_MODE_OP_CMD_OFFSET_SHIFT       16
-       u16 reserved2;
-       u16 modes_buf_offset;
+       u32                                             op_data;
+#define INIT_IF_MODE_OP_OP_MASK                                0xF
+#define INIT_IF_MODE_OP_OP_SHIFT                       0
+#define INIT_IF_MODE_OP_RESERVED1_MASK                 0xFFF
+#define INIT_IF_MODE_OP_RESERVED1_SHIFT                        4
+#define INIT_IF_MODE_OP_CMD_OFFSET_MASK                        0xFFFF
+#define INIT_IF_MODE_OP_CMD_OFFSET_SHIFT               16
+       u16                                             reserved2;
+       u16                                             modes_buf_offset;
 };
 
 /* init operation: if_phase */
 struct init_if_phase_op {
-       u32 op_data;
-#define INIT_IF_PHASE_OP_OP_MASK               0xF
-#define INIT_IF_PHASE_OP_OP_SHIFT              0
-#define INIT_IF_PHASE_OP_RESERVED1_MASK                0xFFF
-#define INIT_IF_PHASE_OP_RESERVED1_SHIFT       4
-#define INIT_IF_PHASE_OP_CMD_OFFSET_MASK       0xFFFF
-#define INIT_IF_PHASE_OP_CMD_OFFSET_SHIFT      16
-       u32 phase_data;
-#define INIT_IF_PHASE_OP_PHASE_MASK            0xFF
-#define INIT_IF_PHASE_OP_PHASE_SHIFT           0
-#define INIT_IF_PHASE_OP_RESERVED2_MASK                0xFF
-#define INIT_IF_PHASE_OP_RESERVED2_SHIFT       8
-#define INIT_IF_PHASE_OP_PHASE_ID_MASK         0xFFFF
-#define INIT_IF_PHASE_OP_PHASE_ID_SHIFT                16
+       u32                                             op_data;
+#define INIT_IF_PHASE_OP_OP_MASK                       0xF
+#define INIT_IF_PHASE_OP_OP_SHIFT                      0
+#define INIT_IF_PHASE_OP_RESERVED1_MASK                        0xFFF
+#define INIT_IF_PHASE_OP_RESERVED1_SHIFT               4
+#define INIT_IF_PHASE_OP_CMD_OFFSET_MASK               0xFFFF
+#define INIT_IF_PHASE_OP_CMD_OFFSET_SHIFT              16
+       u32                                             phase_data;
+#define INIT_IF_PHASE_OP_PHASE_MASK                    0xFF
+#define INIT_IF_PHASE_OP_PHASE_SHIFT                   0
+#define INIT_IF_PHASE_OP_RESERVED2_MASK                        0xFF
+#define INIT_IF_PHASE_OP_RESERVED2_SHIFT               8
+#define INIT_IF_PHASE_OP_PHASE_ID_MASK                 0xFFFF
+#define INIT_IF_PHASE_OP_PHASE_ID_SHIFT                        16
 };
 
 /* init mode operators */
@@ -2907,67 +2907,67 @@ enum init_mode_ops {
 
 /* init operation: raw */
 struct init_raw_op {
-       u32 op_data;
-#define INIT_RAW_OP_OP_MASK            0xF
-#define INIT_RAW_OP_OP_SHIFT           0
-#define INIT_RAW_OP_PARAM1_MASK                0xFFFFFFF
-#define INIT_RAW_OP_PARAM1_SHIFT       4
-       u32 param2;
+       u32                                             op_data;
+#define INIT_RAW_OP_OP_MASK                            0xF
+#define INIT_RAW_OP_OP_SHIFT                           0
+#define INIT_RAW_OP_PARAM1_MASK                                0xFFFFFFF
+#define INIT_RAW_OP_PARAM1_SHIFT                       4
+       u32                                             param2;
 };
 
 /* init array params */
 struct init_op_array_params {
-       u16 size;
-       u16 offset;
+       u16                                             size;
+       u16                                             offset;
 };
 
 /* Write init operation arguments */
 union init_write_args {
-       u32 inline_val;
-       u32 zeros_count;
-       u32 array_offset;
-       struct init_op_array_params runtime;
+       u32                                             inline_val;
+       u32                                             zeros_count;
+       u32                                             array_offset;
+       struct init_op_array_params                     runtime;
 };
 
 /* init operation: write */
 struct init_write_op {
-       u32 data;
-#define INIT_WRITE_OP_OP_MASK          0xF
-#define INIT_WRITE_OP_OP_SHIFT         0
-#define INIT_WRITE_OP_SOURCE_MASK      0x7
-#define INIT_WRITE_OP_SOURCE_SHIFT     4
-#define INIT_WRITE_OP_RESERVED_MASK    0x1
-#define INIT_WRITE_OP_RESERVED_SHIFT   7
-#define INIT_WRITE_OP_WIDE_BUS_MASK    0x1
-#define INIT_WRITE_OP_WIDE_BUS_SHIFT   8
-#define INIT_WRITE_OP_ADDRESS_MASK     0x7FFFFF
-#define INIT_WRITE_OP_ADDRESS_SHIFT    9
-       union init_write_args args;
+       u32                                             data;
+#define INIT_WRITE_OP_OP_MASK                          0xF
+#define INIT_WRITE_OP_OP_SHIFT                         0
+#define INIT_WRITE_OP_SOURCE_MASK                      0x7
+#define INIT_WRITE_OP_SOURCE_SHIFT                     4
+#define INIT_WRITE_OP_RESERVED_MASK                    0x1
+#define INIT_WRITE_OP_RESERVED_SHIFT                   7
+#define INIT_WRITE_OP_WIDE_BUS_MASK                    0x1
+#define INIT_WRITE_OP_WIDE_BUS_SHIFT                   8
+#define INIT_WRITE_OP_ADDRESS_MASK                     0x7FFFFF
+#define INIT_WRITE_OP_ADDRESS_SHIFT                    9
+       union init_write_args                           args;
 };
 
 /* init operation: read */
 struct init_read_op {
-       u32 op_data;
-#define INIT_READ_OP_OP_MASK           0xF
-#define INIT_READ_OP_OP_SHIFT          0
-#define INIT_READ_OP_POLL_TYPE_MASK    0xF
-#define INIT_READ_OP_POLL_TYPE_SHIFT   4
-#define INIT_READ_OP_RESERVED_MASK     0x1
-#define INIT_READ_OP_RESERVED_SHIFT    8
-#define INIT_READ_OP_ADDRESS_MASK      0x7FFFFF
-#define INIT_READ_OP_ADDRESS_SHIFT     9
-       u32 expected_val;
+       u32                                             op_data;
+#define INIT_READ_OP_OP_MASK                           0xF
+#define INIT_READ_OP_OP_SHIFT                          0
+#define INIT_READ_OP_POLL_TYPE_MASK                    0xF
+#define INIT_READ_OP_POLL_TYPE_SHIFT                   4
+#define INIT_READ_OP_RESERVED_MASK                     0x1
+#define INIT_READ_OP_RESERVED_SHIFT                    8
+#define INIT_READ_OP_ADDRESS_MASK                      0x7FFFFF
+#define INIT_READ_OP_ADDRESS_SHIFT                     9
+       u32                                             expected_val;
 };
 
 /* Init operations union */
 union init_op {
-       struct init_raw_op raw;
-       struct init_write_op write;
-       struct init_read_op read;
-       struct init_if_mode_op if_mode;
-       struct init_if_phase_op if_phase;
-       struct init_callback_op callback;
-       struct init_delay_op delay;
+       struct init_raw_op                              raw;
+       struct init_write_op                            write;
+       struct init_read_op                             read;
+       struct init_if_mode_op                          if_mode;
+       struct init_if_phase_op                         if_phase;
+       struct init_callback_op                         callback;
+       struct init_delay_op                            delay;
 };
 
 /* Init command operation types */
index 2ce1f51802310d3f471ba74434cd4eeb314afcb0..775ef5eaefd4de75e8c5b77ad657dedaeb4dcce0 100644 (file)
@@ -156,23 +156,26 @@ static u16 task_region_offsets[1][NUM_OF_CONNECTION_TYPES_E4] = {
                  cmd ## _ ## field, \
                  value)
 
-#define QM_INIT_TX_PQ_MAP(p_hwfn, map, chip, pq_id, vp_pq_id, rl_valid, rl_id, \
-                         ext_voq, wrr) \
-       do { \
-               typeof(map) __map; \
-               memset(&__map, 0, sizeof(__map)); \
-               SET_FIELD(__map.reg, QM_RF_PQ_MAP_ ## chip ## _PQ_VALID, 1); \
-               SET_FIELD(__map.reg, QM_RF_PQ_MAP_ ## chip ## _RL_VALID, \
-                         rl_valid ? 1 : 0);\
-               SET_FIELD(__map.reg, QM_RF_PQ_MAP_ ## chip ## _VP_PQ_ID, \
-                         vp_pq_id); \
-               SET_FIELD(__map.reg, QM_RF_PQ_MAP_ ## chip ## _RL_ID, rl_id); \
-               SET_FIELD(__map.reg, QM_RF_PQ_MAP_ ## chip ## _VOQ, ext_voq); \
-               SET_FIELD(__map.reg, \
-                         QM_RF_PQ_MAP_ ## chip ## _WRR_WEIGHT_GROUP, wrr); \
-               STORE_RT_REG(p_hwfn, QM_REG_TXPQMAP_RT_OFFSET + (pq_id), \
-                            *((u32 *)&__map)); \
-               (map) = __map; \
+#define QM_INIT_TX_PQ_MAP(p_hwfn, map, chip, pq_id, vp_pq_id, rl_valid,              \
+                         rl_id, ext_voq, wrr)                                \
+       do {                                                                  \
+               typeof(map) __map;                                            \
+                                                                             \
+               memset(&__map, 0, sizeof(__map));                             \
+                                                                             \
+               SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_PQ_VALID, 1);      \
+               SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_RL_VALID,          \
+                         !!(rl_valid));                                      \
+               SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_VP_PQ_ID,          \
+                         (vp_pq_id));                                        \
+               SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_RL_ID, (rl_id));   \
+               SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_VOQ, (ext_voq));   \
+               SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_WRR_WEIGHT_GROUP,  \
+                         (wrr));                                             \
+                                                                             \
+               STORE_RT_REG((p_hwfn), QM_REG_TXPQMAP_RT_OFFSET + (pq_id),    \
+                            *((u32 *)&__map));                               \
+               (map) = __map;                                                \
        } while (0)
 
 #define WRITE_PQ_INFO_TO_RAM   1
@@ -1008,8 +1011,7 @@ bool qed_send_qm_stop_cmd(struct qed_hwfn *p_hwfn,
  * Return: Length of the written data in dwords (u32) or -1 on invalid
  *         input.
  */
-static int qed_dmae_to_grc(struct qed_hwfn *p_hwfn,
-                          struct qed_ptt *p_ptt,
+static int qed_dmae_to_grc(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
                           u32 *p_data, u32 addr, u32 len_in_dwords)
 {
        struct qed_dmae_params params = {};
index f9d9e21cb66b3f529decc611c5245981560694d3..8abb31b63e4e35a931d25a9ce15f532776e58bba 100644 (file)
@@ -117,10 +117,9 @@ struct qed_iscsi_conn {
        u8 abortive_dsconnect;
 };
 
-static int
-qed_iscsi_async_event(struct qed_hwfn *p_hwfn,
-                     u8 fw_event_code,
-                     u16 echo, union event_ring_data *data, u8 fw_return_code)
+static int qed_iscsi_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
+                                u16 echo, union event_ring_data *data,
+                                u8 fw_return_code)
 {
        if (p_hwfn->p_iscsi_info->event_cb) {
                struct qed_iscsi_info *p_iscsi = p_hwfn->p_iscsi_info;
index b7a0a717ee6d55857f5fdf0cd914fc96d6ccd1c2..6f2cd5a18e5f7c2bbf2ed63637ea465246aa978c 100644 (file)
@@ -59,9 +59,8 @@ struct mpa_v2_hdr {
 #define QED_IWARP_DEF_KA_TIMEOUT       (1200000)       /* 20 min */
 #define QED_IWARP_DEF_KA_INTERVAL      (1000)          /* 1 sec */
 
-static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn,
-                                u8 fw_event_code, u16 echo,
-                                union event_ring_data *data,
+static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
+                                u16 echo, union event_ring_data *data,
                                 u8 fw_return_code);
 
 /* Override devinfo with iWARP specific values */
@@ -3008,9 +3007,8 @@ qed_iwarp_check_ep_ok(struct qed_hwfn *p_hwfn, struct qed_iwarp_ep *ep)
        return true;
 }
 
-static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn,
-                                u8 fw_event_code, u16 echo,
-                                union event_ring_data *data,
+static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
+                                u16 echo, union event_ring_data *data,
                                 u8 fw_return_code)
 {
        struct qed_rdma_events events = p_hwfn->p_rdma_info->events;
index d5db07db65b138b55f67d038811636476281d674..871282187268cd8f9fc5e8ccbc29acea7fceb8c7 100644 (file)
 
 static void qed_roce_free_real_icid(struct qed_hwfn *p_hwfn, u16 icid);
 
-static int
-qed_roce_async_event(struct qed_hwfn *p_hwfn,
-                    u8 fw_event_code,
-                    u16 echo, union event_ring_data *data, u8 fw_return_code)
+static int qed_roce_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
+                               u16 echo, union event_ring_data *data,
+                               u8 fw_return_code)
 {
        struct qed_rdma_events events = p_hwfn->p_rdma_info->events;
 
index 35539e951bee9f5d9bbd80315cd5b51468a4bc40..f7f983a8bf445341a36ffd66e5a0662555cb5e39 100644 (file)
@@ -154,12 +154,9 @@ struct qed_consq {
        struct qed_chain chain;
 };
 
-typedef int
-(*qed_spq_async_comp_cb)(struct qed_hwfn *p_hwfn,
-                        u8 opcode,
-                        u16 echo,
-                        union event_ring_data *data,
-                        u8 fw_return_code);
+typedef int (*qed_spq_async_comp_cb)(struct qed_hwfn *p_hwfn, u8 opcode,
+                                    u16 echo, union event_ring_data *data,
+                                    u8 fw_return_code);
 
 int
 qed_spq_register_async_cb(struct qed_hwfn *p_hwfn,
index 3930958f0ffac05b16c2d5e353b54c71694798b6..b4e21e4792b7fe2506cea97f7bcdce23bc023add 100644 (file)
@@ -4037,9 +4037,7 @@ static void qed_sriov_vfpf_malicious(struct qed_hwfn *p_hwfn,
        }
 }
 
-static int qed_sriov_eqe_event(struct qed_hwfn *p_hwfn,
-                              u8 opcode,
-                              __le16 echo,
+static int qed_sriov_eqe_event(struct qed_hwfn *p_hwfn, u8 opcode, u16 echo,
                               union event_ring_data *data, u8 fw_return_code)
 {
        switch (opcode) {