mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

net: qed: improve indentation of some parts of code

Browse source 
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>
This commit is contained in:
Alexander Lobakin 2020-07-06 18:38:17 +03:00 committed by David S. Miller
parent 71e11a3f5e
commit 1451e467a3
9 changed files with 136 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/ethernet/qlogic/qed/qed_debug.c
View file

@ -1122,9 +1122,8 @@ static u32 qed_dump_fw_ver_param(struct qed_hwfn *p_hwfn,
dump, "fw-version", fw_ver_str); dump, "fw-version", fw_ver_str);
offset += qed_dump_str_param(dump_buf + offset, offset += qed_dump_str_param(dump_buf + offset,
dump, "fw-image", fw_img_str); dump, "fw-image", fw_img_str);
offset += qed_dump_num_param(dump_buf + offset, offset += qed_dump_num_param(dump_buf + offset, dump, "fw-timestamp",
dump, fw_info.ver.timestamp);
"fw-timestamp", fw_info.ver.timestamp);
return offset; return offset;
} }

24
drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c
View file

@ -156,21 +156,24 @@ static u16 task_region_offsets[1][NUM_OF_CONNECTION_TYPES_E4] = {
cmd ## _ ## field, \ cmd ## _ ## field, \
value) value)
#define QM_INIT_TX_PQ_MAP(p_hwfn, map, chip, pq_id, vp_pq_id, rl_valid, rl_id, \ #define QM_INIT_TX_PQ_MAP(p_hwfn, map, chip, pq_id, vp_pq_id, rl_valid, \
ext_voq, wrr) \ rl_id, ext_voq, wrr) \
do { \ do { \
typeof(map) __map; \ typeof(map) __map; \
\
memset(&__map, 0, sizeof(__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##_PQ_VALID, 1); \
SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_RL_VALID, \ SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_RL_VALID, \
rl_valid ? 1 : 0);\ !!(rl_valid)); \
SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_VP_PQ_ID, \ SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_VP_PQ_ID, \
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##_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##_VOQ, (ext_voq)); \
SET_FIELD(__map.reg, \ SET_FIELD(__map.reg, QM_RF_PQ_MAP_##chip##_WRR_WEIGHT_GROUP, \
QM_RF_PQ_MAP_ ## chip ## _WRR_WEIGHT_GROUP, wrr); \ (wrr)); \
STORE_RT_REG(p_hwfn, QM_REG_TXPQMAP_RT_OFFSET + (pq_id), \ \
STORE_RT_REG((p_hwfn), QM_REG_TXPQMAP_RT_OFFSET + (pq_id), \
*((u32 *)&__map)); \ *((u32 *)&__map)); \
(map) = __map; \ (map) = __map; \
} while (0) } while (0)
@ -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 * Return: Length of the written data in dwords (u32) or -1 on invalid
* input. * input.
*/ */
static int qed_dmae_to_grc(struct qed_hwfn *p_hwfn, static int qed_dmae_to_grc(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
struct qed_ptt *p_ptt,
u32 *p_data, u32 addr, u32 len_in_dwords) u32 *p_data, u32 addr, u32 len_in_dwords)
{ {
struct qed_dmae_params params = {}; struct qed_dmae_params params = {};

7
drivers/net/ethernet/qlogic/qed/qed_iscsi.c
View file

@ -117,10 +117,9 @@ struct qed_iscsi_conn {
u8 abortive_dsconnect; u8 abortive_dsconnect;
}; };
static int static int qed_iscsi_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
qed_iscsi_async_event(struct qed_hwfn *p_hwfn, u16 echo, union event_ring_data *data,
u8 fw_event_code, u8 fw_return_code)
u16 echo, union event_ring_data *data, u8 fw_return_code)
{ {
if (p_hwfn->p_iscsi_info->event_cb) { if (p_hwfn->p_iscsi_info->event_cb) {
struct qed_iscsi_info *p_iscsi = p_hwfn->p_iscsi_info; struct qed_iscsi_info *p_iscsi = p_hwfn->p_iscsi_info;

10
drivers/net/ethernet/qlogic/qed/qed_iwarp.c
View file

@ -59,9 +59,8 @@ struct mpa_v2_hdr {
#define QED_IWARP_DEF_KA_TIMEOUT (1200000) /* 20 min */ #define QED_IWARP_DEF_KA_TIMEOUT (1200000) /* 20 min */
#define QED_IWARP_DEF_KA_INTERVAL (1000) /* 1 sec */ #define QED_IWARP_DEF_KA_INTERVAL (1000) /* 1 sec */
static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn, static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
u8 fw_event_code, u16 echo, u16 echo, union event_ring_data *data,
union event_ring_data *data,
u8 fw_return_code); u8 fw_return_code);
/* Override devinfo with iWARP specific values */ /* 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; return true;
} }
static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn, static int qed_iwarp_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
u8 fw_event_code, u16 echo, u16 echo, union event_ring_data *data,
union event_ring_data *data,
u8 fw_return_code) u8 fw_return_code)
{ {
struct qed_rdma_events events = p_hwfn->p_rdma_info->events; struct qed_rdma_events events = p_hwfn->p_rdma_info->events;

7
drivers/net/ethernet/qlogic/qed/qed_roce.c
View file

@ -37,10 +37,9 @@
static void qed_roce_free_real_icid(struct qed_hwfn *p_hwfn, u16 icid); static void qed_roce_free_real_icid(struct qed_hwfn *p_hwfn, u16 icid);
static int static int qed_roce_async_event(struct qed_hwfn *p_hwfn, u8 fw_event_code,
qed_roce_async_event(struct qed_hwfn *p_hwfn, u16 echo, union event_ring_data *data,
u8 fw_event_code, u8 fw_return_code)
u16 echo, union event_ring_data *data, u8 fw_return_code)
{ {
struct qed_rdma_events events = p_hwfn->p_rdma_info->events; struct qed_rdma_events events = p_hwfn->p_rdma_info->events;

7
drivers/net/ethernet/qlogic/qed/qed_sp.h
View file

@ -154,11 +154,8 @@ struct qed_consq {
struct qed_chain chain; struct qed_chain chain;
}; };
typedef int typedef int (*qed_spq_async_comp_cb)(struct qed_hwfn *p_hwfn, u8 opcode,
(*qed_spq_async_comp_cb)(struct qed_hwfn *p_hwfn, u16 echo, union event_ring_data *data,
u8 opcode,
u16 echo,
union event_ring_data *data,
u8 fw_return_code); u8 fw_return_code);
int int

4
drivers/net/ethernet/qlogic/qed/qed_sriov.c
View 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, static int qed_sriov_eqe_event(struct qed_hwfn *p_hwfn, u8 opcode, u16 echo,
u8 opcode,
__le16 echo,
union event_ring_data *data, u8 fw_return_code) union event_ring_data *data, u8 fw_return_code)
{ {
switch (opcode) { switch (opcode) {