Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66431b0e authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/hfi1: Define platform_config_table_limits once 



Defining static data structures in a header file is wrong because
this causes the data structure to be instantiated once in every .c
file it is included in. Hence move the definition of a static
array from a header file into the only .c file in which it is used.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Dennis Dalessandro <dennis.dalessandro@intel.com>
Cc: Dean Luick <dean.luick@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 0fc859a6

drivers/infiniband/hw/hfi1/firmware.c

+10 −0
Original line number Diff line number Diff line
@@ -239,6 +239,16 @@ static const u8 all_fabric_serdes_broadcast = 0xe1; 
const u8 pcie_serdes_broadcast[2] = { 0xe2, 0xe3 };

static const u8 all_pcie_serdes_broadcast = 0xe0;



static const u32 platform_config_table_limits[PLATFORM_CONFIG_TABLE_MAX] = {

	0,

	SYSTEM_TABLE_MAX,

	PORT_TABLE_MAX,

	RX_PRESET_TABLE_MAX,

	TX_PRESET_TABLE_MAX,

	QSFP_ATTEN_TABLE_MAX,

	VARIABLE_SETTINGS_TABLE_MAX

};



/* forwards */

static void dispose_one_firmware(struct firmware_details *fdet);

static int load_fabric_serdes_firmware(struct hfi1_devdata *dd,

drivers/infiniband/hw/hfi1/platform.h

+0 −10
Original line number Diff line number Diff line
@@ -168,16 +168,6 @@ struct platform_config_cache { 
	struct platform_config_data config_tables[PLATFORM_CONFIG_TABLE_MAX];

};



static const u32 platform_config_table_limits[PLATFORM_CONFIG_TABLE_MAX] = {

	0,

	SYSTEM_TABLE_MAX,

	PORT_TABLE_MAX,

	RX_PRESET_TABLE_MAX,

	TX_PRESET_TABLE_MAX,

	QSFP_ATTEN_TABLE_MAX,

	VARIABLE_SETTINGS_TABLE_MAX

};



/* This section defines default values and encodings for the

 * fields defined for each table above

 */