Commit fcf3c8cc authored by Jakub Kicinski's avatar Jakub Kicinski

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.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fecef4cd 3b05c799
...@@ -1021,7 +1021,7 @@ static const struct regmap_config ar9331_mdio_regmap_config = { ...@@ -1021,7 +1021,7 @@ static const struct regmap_config ar9331_mdio_regmap_config = {
.cache_type = REGCACHE_MAPLE, .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, .reg_format_endian_default = REGMAP_ENDIAN_NATIVE,
.val_format_endian_default = REGMAP_ENDIAN_NATIVE, .val_format_endian_default = REGMAP_ENDIAN_NATIVE,
.read = ar9331_mdio_read, .read = ar9331_mdio_read,
......
...@@ -565,7 +565,7 @@ qca8k_regmap_update_bits(void *ctx, uint32_t reg, uint32_t mask, uint32_t write_ ...@@ -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); 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, .reg_bits = 16,
.val_bits = 32, .val_bits = 32,
.reg_stride = 4, .reg_stride = 4,
......
...@@ -474,13 +474,13 @@ static struct regmap_config regcfg = { ...@@ -474,13 +474,13 @@ static struct regmap_config regcfg = {
.unlock = regmap_unlock_mutex, .unlock = regmap_unlock_mutex,
}; };
static struct regmap_bus regmap_encx24j600 = { static const struct regmap_bus regmap_encx24j600 = {
.write = regmap_encx24j600_write, .write = regmap_encx24j600_write,
.read = regmap_encx24j600_read, .read = regmap_encx24j600_read,
.reg_update_bits = regmap_encx24j600_reg_update_bits, .reg_update_bits = regmap_encx24j600_reg_update_bits,
}; };
static struct regmap_config phycfg = { static const struct regmap_config phycfg = {
.name = "phy", .name = "phy",
.reg_bits = 8, .reg_bits = 8,
.val_bits = 16, .val_bits = 16,
...@@ -492,7 +492,7 @@ static struct regmap_config phycfg = { ...@@ -492,7 +492,7 @@ static struct regmap_config phycfg = {
.volatile_reg = encx24j600_phymap_volatile, .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_write = regmap_encx24j600_phy_reg_write,
.reg_read = regmap_encx24j600_phy_reg_read, .reg_read = regmap_encx24j600_phy_reg_read,
}; };
......
...@@ -95,7 +95,7 @@ enum { ...@@ -95,7 +95,7 @@ enum {
* @flags: Flags to represent IEP properties * @flags: Flags to represent IEP properties
*/ */
struct icss_iep_plat_data { struct icss_iep_plat_data {
struct regmap_config *config; const struct regmap_config *config;
u32 reg_offs[ICSS_IEP_MAX_REGS]; u32 reg_offs[ICSS_IEP_MAX_REGS];
u32 flags; u32 flags;
}; };
...@@ -952,7 +952,7 @@ static int icss_iep_regmap_read(void *context, unsigned int reg, ...@@ -952,7 +952,7 @@ static int icss_iep_regmap_read(void *context, unsigned int reg,
return 0; return 0;
} }
static struct regmap_config am654_icss_iep_regmap_config = { static const struct regmap_config am654_icss_iep_regmap_config = {
.name = "icss iep", .name = "icss iep",
.reg_stride = 1, .reg_stride = 1,
.reg_write = icss_iep_regmap_write, .reg_write = icss_iep_regmap_write,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment