Skip to content

Commit fcf3c8c

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents fecef4c + 3b05c79 commit fcf3c8c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

drivers/net/dsa/qca/ar9331.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ static const struct regmap_config ar9331_mdio_regmap_config = {
10211021
.cache_type = REGCACHE_MAPLE,
10221022
};
10231023

1024-
static struct regmap_bus ar9331_sw_bus = {
1024+
static const struct regmap_bus ar9331_sw_bus = {
10251025
.reg_format_endian_default = REGMAP_ENDIAN_NATIVE,
10261026
.val_format_endian_default = REGMAP_ENDIAN_NATIVE,
10271027
.read = ar9331_mdio_read,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ qca8k_regmap_update_bits(void *ctx, uint32_t reg, uint32_t mask, uint32_t write_
565565
return qca8k_regmap_update_bits_mii(priv, reg, mask, write_val);
566566
}
567567

568-
static struct regmap_config qca8k_regmap_config = {
568+
static const struct regmap_config qca8k_regmap_config = {
569569
.reg_bits = 16,
570570
.val_bits = 32,
571571
.reg_stride = 4,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,13 @@ static struct regmap_config regcfg = {
474474
.unlock = regmap_unlock_mutex,
475475
};
476476

477-
static struct regmap_bus regmap_encx24j600 = {
477+
static const struct regmap_bus regmap_encx24j600 = {
478478
.write = regmap_encx24j600_write,
479479
.read = regmap_encx24j600_read,
480480
.reg_update_bits = regmap_encx24j600_reg_update_bits,
481481
};
482482

483-
static struct regmap_config phycfg = {
483+
static const struct regmap_config phycfg = {
484484
.name = "phy",
485485
.reg_bits = 8,
486486
.val_bits = 16,
@@ -492,7 +492,7 @@ static struct regmap_config phycfg = {
492492
.volatile_reg = encx24j600_phymap_volatile,
493493
};
494494

495-
static struct regmap_bus phymap_encx24j600 = {
495+
static const struct regmap_bus phymap_encx24j600 = {
496496
.reg_write = regmap_encx24j600_phy_reg_write,
497497
.reg_read = regmap_encx24j600_phy_reg_read,
498498
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ enum {
9595
* @flags: Flags to represent IEP properties
9696
*/
9797
struct icss_iep_plat_data {
98-
struct regmap_config *config;
98+
const struct regmap_config *config;
9999
u32 reg_offs[ICSS_IEP_MAX_REGS];
100100
u32 flags;
101101
};
@@ -952,7 +952,7 @@ static int icss_iep_regmap_read(void *context, unsigned int reg,
952952
return 0;
953953
}
954954

955-
static struct regmap_config am654_icss_iep_regmap_config = {
955+
static const struct regmap_config am654_icss_iep_regmap_config = {
956956
.name = "icss iep",
957957
.reg_stride = 1,
958958
.reg_write = icss_iep_regmap_write,

0 commit comments

Comments
 (0)