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

Commit 18e83e4c authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Const-qualify static data as appropriate, partly prompted by checkpatch 



Fix the following warnings:

WARNING: struct dev_pm_ops should normally be const
WARNING: static const char * array should probably be static const char * const

Similarly const-qualify struct i2c_board_info, struct i2c_algo_bit_data,
struct efx_ethtool_stat, struct efx_mtd_ops and struct siena_nvram_type_info.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 0beaca2c

drivers/net/ethernet/sfc/efx.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


/* Loopback mode names (see LOOPBACK_MODE()) */

const unsigned int efx_loopback_mode_max = LOOPBACK_MAX;

const char *efx_loopback_mode_names[] = {

const char *const efx_loopback_mode_names[] = {

	[LOOPBACK_NONE]		= "NONE",

	[LOOPBACK_DATA]		= "DATAPATH",

	[LOOPBACK_GMAC]		= "GMAC",
@@ -69,7 +69,7 @@ const char *efx_loopback_mode_names[] = { 
};



const unsigned int efx_reset_type_max = RESET_TYPE_MAX;

const char *efx_reset_type_names[] = {

const char *const efx_reset_type_names[] = {

	[RESET_TYPE_INVISIBLE]     = "INVISIBLE",

	[RESET_TYPE_ALL]           = "ALL",

	[RESET_TYPE_WORLD]         = "WORLD",
@@ -2660,7 +2660,7 @@ static int efx_pm_suspend(struct device *dev) 
	return rc;

}



static struct dev_pm_ops efx_pm_ops = {

static const struct dev_pm_ops efx_pm_ops = {

	.suspend	= efx_pm_suspend,

	.resume		= efx_pm_resume,

	.freeze		= efx_pm_freeze,

drivers/net/ethernet/sfc/ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static u64 efx_get_atomic_stat(void *field) 
	EFX_ETHTOOL_STAT(tx_##field, tx_queue, field,		\

			 unsigned int, efx_get_uint_stat)



static struct efx_ethtool_stat efx_ethtool_stats[] = {

static const struct efx_ethtool_stat efx_ethtool_stats[] = {

	EFX_ETHTOOL_U64_MAC_STAT(tx_bytes),

	EFX_ETHTOOL_U64_MAC_STAT(tx_good_bytes),

	EFX_ETHTOOL_U64_MAC_STAT(tx_bad_bytes),
@@ -486,7 +486,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev, 
{

	struct efx_nic *efx = netdev_priv(net_dev);

	struct efx_mac_stats *mac_stats = &efx->mac_stats;

	struct efx_ethtool_stat *stat;

	const struct efx_ethtool_stat *stat;

	struct efx_channel *channel;

	struct efx_tx_queue *tx_queue;

	struct rtnl_link_stats64 temp;

drivers/net/ethernet/sfc/falcon.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int falcon_getscl(void *data) 
	return EFX_OWORD_FIELD(reg, FRF_AB_GPIO0_IN);

}



static struct i2c_algo_bit_data falcon_i2c_bit_operations = {

static const struct i2c_algo_bit_data falcon_i2c_bit_operations = {

	.setsda		= falcon_setsda,

	.setscl		= falcon_setscl,

	.getsda		= falcon_getsda,

drivers/net/ethernet/sfc/falcon_boards.c

+6 −6
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static const u8 falcon_lm87_common_regs[] = { 
	0

};



static int efx_init_lm87(struct efx_nic *efx, struct i2c_board_info *info,

static int efx_init_lm87(struct efx_nic *efx, const struct i2c_board_info *info,

			 const u8 *reg_values)

{

	struct falcon_board *board = falcon_board(efx);
@@ -179,7 +179,7 @@ static int efx_check_lm87(struct efx_nic *efx, unsigned mask) 
#else /* !CONFIG_SENSORS_LM87 */



static inline int

efx_init_lm87(struct efx_nic *efx, struct i2c_board_info *info,

efx_init_lm87(struct efx_nic *efx, const struct i2c_board_info *info,

	      const u8 *reg_values)

{

	return 0;
@@ -442,7 +442,7 @@ static int sfe4001_check_hw(struct efx_nic *efx) 
	return (status < 0) ? -EIO : -ERANGE;

}



static struct i2c_board_info sfe4001_hwmon_info = {

static const struct i2c_board_info sfe4001_hwmon_info = {

	I2C_BOARD_INFO("max6647", 0x4e),

};
@@ -522,7 +522,7 @@ static const u8 sfe4002_lm87_regs[] = { 
	0

};



static struct i2c_board_info sfe4002_hwmon_info = {

static const struct i2c_board_info sfe4002_hwmon_info = {

	I2C_BOARD_INFO("lm87", 0x2e),

	.platform_data	= &sfe4002_lm87_channel,

};
@@ -591,7 +591,7 @@ static const u8 sfn4112f_lm87_regs[] = { 
	0

};



static struct i2c_board_info sfn4112f_hwmon_info = {

static const struct i2c_board_info sfn4112f_hwmon_info = {

	I2C_BOARD_INFO("lm87", 0x2e),

	.platform_data	= &sfn4112f_lm87_channel,

};
@@ -653,7 +653,7 @@ static const u8 sfe4003_lm87_regs[] = { 
	0

};



static struct i2c_board_info sfe4003_hwmon_info = {

static const struct i2c_board_info sfe4003_hwmon_info = {

	I2C_BOARD_INFO("lm87", 0x2e),

	.platform_data	= &sfe4003_lm87_channel,

};

drivers/net/ethernet/sfc/mcdi.c

+2 −2
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static void efx_mcdi_process_link_change(struct efx_nic *efx, efx_qword_t *ev) 
	efx_link_status_changed(efx);

}



static const char *sensor_names[] = {

static const char *const sensor_names[] = {

	[MC_CMD_SENSOR_CONTROLLER_TEMP] = "Controller temp. sensor",

	[MC_CMD_SENSOR_PHY_COMMON_TEMP] = "PHY shared temp. sensor",

	[MC_CMD_SENSOR_CONTROLLER_COOLING] = "Controller cooling",
@@ -518,7 +518,7 @@ static const char *sensor_names[] = { 
	[MC_CMD_SENSOR_IN_12V0] = "12V supply sensor"

};



static const char *sensor_status_names[] = {

static const char *const sensor_status_names[] = {

	[MC_CMD_SENSOR_STATE_OK] = "OK",

	[MC_CMD_SENSOR_STATE_WARNING] = "Warning",

	[MC_CMD_SENSOR_STATE_FATAL] = "Fatal",