Commit 39701603 authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by David S. Miller
Browse files

qed: avoid defines prefixed with CONFIG 



Defines prefixed with "CONFIG" should be limited to proper Kconfig options,
that are introduced in a Kconfig file.

Here, constants for bitmap indices of some configs are defined and these
defines begin with the config's name, and are suffixed with BITMAP_IDX.

To avoid defines prefixed with "CONFIG", name these constants
BITMAP_IDX_FOR_CONFIG_XYZ instead of CONFIG_XYZ_BITMAP_IDX.

No functional change.

Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8dbd6e4c

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

+12 −12
Original line number Diff line number Diff line
@@ -767,34 +767,34 @@ static int qed_mcp_cancel_load_req(struct qed_hwfn *p_hwfn, 
	return rc;

}



#define CONFIG_QEDE_BITMAP_IDX		BIT(0)

#define CONFIG_QED_SRIOV_BITMAP_IDX	BIT(1)

#define CONFIG_QEDR_BITMAP_IDX		BIT(2)

#define CONFIG_QEDF_BITMAP_IDX		BIT(4)

#define CONFIG_QEDI_BITMAP_IDX		BIT(5)

#define CONFIG_QED_LL2_BITMAP_IDX	BIT(6)

#define BITMAP_IDX_FOR_CONFIG_QEDE	BIT(0)

#define BITMAP_IDX_FOR_CONFIG_QED_SRIOV	BIT(1)

#define BITMAP_IDX_FOR_CONFIG_QEDR	BIT(2)

#define BITMAP_IDX_FOR_CONFIG_QEDF	BIT(4)

#define BITMAP_IDX_FOR_CONFIG_QEDI	BIT(5)

#define BITMAP_IDX_FOR_CONFIG_QED_LL2	BIT(6)



static u32 qed_get_config_bitmap(void)

{

	u32 config_bitmap = 0x0;



	if (IS_ENABLED(CONFIG_QEDE))

		config_bitmap |= CONFIG_QEDE_BITMAP_IDX;

		config_bitmap |= BITMAP_IDX_FOR_CONFIG_QEDE;



	if (IS_ENABLED(CONFIG_QED_SRIOV))

		config_bitmap |= CONFIG_QED_SRIOV_BITMAP_IDX;

		config_bitmap |= BITMAP_IDX_FOR_CONFIG_QED_SRIOV;



	if (IS_ENABLED(CONFIG_QED_RDMA))

		config_bitmap |= CONFIG_QEDR_BITMAP_IDX;

		config_bitmap |= BITMAP_IDX_FOR_CONFIG_QEDR;



	if (IS_ENABLED(CONFIG_QED_FCOE))

		config_bitmap |= CONFIG_QEDF_BITMAP_IDX;

		config_bitmap |= BITMAP_IDX_FOR_CONFIG_QEDF;



	if (IS_ENABLED(CONFIG_QED_ISCSI))

		config_bitmap |= CONFIG_QEDI_BITMAP_IDX;

		config_bitmap |= BITMAP_IDX_FOR_CONFIG_QEDI;



	if (IS_ENABLED(CONFIG_QED_LL2))

		config_bitmap |= CONFIG_QED_LL2_BITMAP_IDX;

		config_bitmap |= BITMAP_IDX_FOR_CONFIG_QED_LL2;



	return config_bitmap;

}