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

Merge branch 'net-constify-struct-regmap_bus-regmap_config' 

Javier Carrasco says:

====================
net: constify struct regmap_bus/regmap_config

This series adds the const modifier to the remaining regmap_bus and
regmap_config structs within the net subsystem that are effectively
used as const (i.e., only read after their declaration), but kept as
writtable data.
====================

Link: https://patch.msgid.link/20240703-net-const-regmap-v1-0-ff4aeceda02c@gmail.com


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

drivers/net/dsa/qca/ar9331.c

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ static const struct regmap_config ar9331_mdio_regmap_config = { 
	.cache_type = REGCACHE_MAPLE,

};



static struct regmap_bus ar9331_sw_bus = {

static const struct regmap_bus ar9331_sw_bus = {

	.reg_format_endian_default = REGMAP_ENDIAN_NATIVE,

	.val_format_endian_default = REGMAP_ENDIAN_NATIVE,

	.read = ar9331_mdio_read,

drivers/net/dsa/qca/qca8k-8xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ qca8k_regmap_update_bits(void *ctx, uint32_t reg, uint32_t mask, uint32_t write_ 
	return qca8k_regmap_update_bits_mii(priv, reg, mask, write_val);

}



static struct regmap_config qca8k_regmap_config = {

static const struct regmap_config qca8k_regmap_config = {

	.reg_bits = 16,

	.val_bits = 32,

	.reg_stride = 4,

drivers/net/ethernet/microchip/encx24j600-regmap.c

+3 −3
Original line number Diff line number Diff line
@@ -474,13 +474,13 @@ static struct regmap_config regcfg = { 
	.unlock = regmap_unlock_mutex,

};



static struct regmap_bus regmap_encx24j600 = {

static const struct regmap_bus regmap_encx24j600 = {

	.write = regmap_encx24j600_write,

	.read = regmap_encx24j600_read,

	.reg_update_bits = regmap_encx24j600_reg_update_bits,

};



static struct regmap_config phycfg = {

static const struct regmap_config phycfg = {

	.name = "phy",

	.reg_bits = 8,

	.val_bits = 16,
@@ -492,7 +492,7 @@ static struct regmap_config phycfg = { 
	.volatile_reg = encx24j600_phymap_volatile,

};



static struct regmap_bus phymap_encx24j600 = {

static const struct regmap_bus phymap_encx24j600 = {

	.reg_write = regmap_encx24j600_phy_reg_write,

	.reg_read = regmap_encx24j600_phy_reg_read,

};

drivers/net/ethernet/ti/icssg/icss_iep.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ enum { 
 * @flags: Flags to represent IEP properties

 */

struct icss_iep_plat_data {

	struct regmap_config *config;

	const struct regmap_config *config;

	u32 reg_offs[ICSS_IEP_MAX_REGS];

	u32 flags;

};
@@ -952,7 +952,7 @@ static int icss_iep_regmap_read(void *context, unsigned int reg, 
	return 0;

}



static struct regmap_config am654_icss_iep_regmap_config = {

static const struct regmap_config am654_icss_iep_regmap_config = {

	.name = "icss iep",

	.reg_stride = 1,

	.reg_write = icss_iep_regmap_write,