Commit bcff1a37 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'cleanup-in-huawei-hinic-driver' 

Zhengchao Shao says:

====================
cleanup in Huawei hinic driver

Do code cleanup in Huawei hinic driver.
====================

Link: https://lore.kernel.org/r/20220921123358.63442-1-shaozhengchao@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3f5b606d c706df6d

drivers/net/ethernet/huawei/hinic/hinic_debugfs.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#define    TBL_ID_FUNC_CFG_SM_INST                      1



#define HINIC_FUNCTION_CONFIGURE_TABLE_SIZE             64

#define HINIC_FUNCTION_CONFIGURE_TABLE			1



struct hinic_cmd_lt_rd {

	u8	status;

drivers/net/ethernet/huawei/hinic/hinic_ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
#define COALESCE_ALL_QUEUE		0xFFFF

#define COALESCE_MAX_PENDING_LIMIT	(255 * COALESCE_PENDING_LIMIT_UNIT)

#define COALESCE_MAX_TIMER_CFG		(255 * COALESCE_TIMER_CFG_UNIT)

#define OBJ_STR_MAX_LEN			32



struct hw2ethtool_link_mode {

	enum ethtool_link_mode_bit_indices link_mode_bit;

drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c

+2 −7
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ 
						     struct hinic_func_to_io, \

						     cmdqs)



enum cmdq_wqe_type {

	WQE_LCMD_TYPE = 0,

	WQE_SCMD_TYPE = 1,

};



enum completion_format {

	COMPLETE_DIRECT = 0,

	COMPLETE_SGE    = 1,
@@ -509,7 +504,7 @@ int hinic_cmdq_direct_resp(struct hinic_cmdqs *cmdqs, 
 *

 * Return 0 - Success, negative - Failure

 **/

int hinic_set_arm_bit(struct hinic_cmdqs *cmdqs,

static int hinic_set_arm_bit(struct hinic_cmdqs *cmdqs,

			     enum hinic_set_arm_qtype q_type, u32 q_id)

{

	struct hinic_cmdq *cmdq = &cmdqs->cmdq[HINIC_CMDQ_SYNC];

drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h

+0 −3
Original line number Diff line number Diff line
@@ -177,9 +177,6 @@ int hinic_cmdq_direct_resp(struct hinic_cmdqs *cmdqs, 
			   enum hinic_mod_type mod, u8 cmd,

			   struct hinic_cmdq_buf *buf_in, u64 *out_param);



int hinic_set_arm_bit(struct hinic_cmdqs *cmdqs,

		      enum hinic_set_arm_qtype q_type, u32 q_id);



int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif,

		     void __iomem **db_area);

drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
	(HINIC_DMA_ATTR_BASE + (idx) * HINIC_DMA_ATTR_STRIDE)



#define HINIC_PPF_ELECTION_STRIDE                       0x4

#define HINIC_CSR_MAX_PORTS                             4



#define HINIC_CSR_PPF_ELECTION_ADDR(idx)                \

	(HINIC_ELECTION_BASE +  (idx) * HINIC_PPF_ELECTION_STRIDE)