Commit 1451e467 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller
Browse files

net: qed: improve indentation of some parts of code 



To not mix functional and stylistic changes, correct indentation
of code that will be modified in the subsequent commits.

Signed-off-by: default avatarAlexander Lobakin <alobakin@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71e11a3f

drivers/net/ethernet/qlogic/qed/qed_debug.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c

+21 −19
Original line number Diff line number Diff line
@@ -156,21 +156,24 @@ 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) \

#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);\

			  !!(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), \

			  (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)
@@ -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 = {};

drivers/net/ethernet/qlogic/qed/qed_iscsi.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/qlogic/qed/qed_iwarp.c

+4 −6
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/qlogic/qed/qed_roce.c

+3 −4
Original line number Diff line number Diff line
@@ -37,10 +37,9 @@ 


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;