From: Peng Fan <peng.fan@linux.dev>
To: Mark Brown <broonie@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Danilo Krummrich <dakr@kernel.org>,
Johan Hovold <johan@kernel.org>,
Lucas Tanure <tanureal@opensource.cirrus.com>
Cc: linux-kernel@vger.kernel.org, driver-core@lists.linux.dev,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH v2 07/10] regmap: factor out format initialisation into helpers
Date: Fri, 13 Nov 2026 23:31:55 +0800 [thread overview]
Message-ID: <20261113-regmap-improve-v2-7-5dfd6a89078f@nxp.com> (raw)
In-Reply-To: <20261113-regmap-improve-v2-0-5dfd6a89078f@nxp.com>
From: Peng Fan <peng.fan@nxp.com>
Extract the two large nested switch statements that select
format_reg()/format_write() and format_val()/parse_val() into dedicated
regmap_set_reg_format() and regmap_set_val_format() helpers. Wrap the
entire format setup sequence - format selection, endianness cross-check,
work buffer allocation and bus write callback selection - into a single
regmap_init_format() function.
The two callers (config->read/write path with NATIVE endian, and the
bus->read/write path with bus-derived endian) now each call
regmap_init_format() directly, which eliminates the forward
"goto skip_format_initialization" and removes the label entirely.
The implicit "ret = -EINVAL; /* Later error paths rely on this */"
contract is replaced by explicit return codes in each helper.
No functional change.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/base/regmap/regmap.c | 399 ++++++++++++++++++++++---------------------
1 file changed, 200 insertions(+), 199 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index eaf7555f9765..ae313a8e4ffe 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -846,6 +846,197 @@ static int regmap_init_ranges(struct regmap *map, const struct regmap_config *co
return 0;
}
+/* Pick format_reg()/format_write() for the register width and endianness. */
+static int regmap_set_reg_format(struct regmap *map, const struct regmap_config *config,
+ enum regmap_endian reg_endian)
+{
+ switch (config->reg_bits + map->reg_shift) {
+ case 2:
+ if (config->val_bits != 6)
+ return -EINVAL;
+ map->format.format_write = regmap_format_2_6_write;
+ return 0;
+
+ case 4:
+ if (config->val_bits != 12)
+ return -EINVAL;
+ map->format.format_write = regmap_format_4_12_write;
+ return 0;
+
+ case 7:
+ switch (config->val_bits) {
+ case 9:
+ map->format.format_write = regmap_format_7_9_write;
+ return 0;
+ case 17:
+ map->format.format_write = regmap_format_7_17_write;
+ return 0;
+ }
+ return -EINVAL;
+
+ case 10:
+ if (config->val_bits != 14)
+ return -EINVAL;
+ map->format.format_write = regmap_format_10_14_write;
+ return 0;
+
+ case 12:
+ if (config->val_bits != 20)
+ return -EINVAL;
+ map->format.format_write = regmap_format_12_20_write;
+ return 0;
+
+ case 8:
+ map->format.format_reg = regmap_format_8;
+ return 0;
+
+ case 16:
+ switch (reg_endian) {
+ case REGMAP_ENDIAN_BIG:
+ map->format.format_reg = regmap_format_16_be;
+ return 0;
+ case REGMAP_ENDIAN_LITTLE:
+ map->format.format_reg = regmap_format_16_le;
+ return 0;
+ case REGMAP_ENDIAN_NATIVE:
+ map->format.format_reg = regmap_format_16_native;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+
+ case 24:
+ if (reg_endian != REGMAP_ENDIAN_BIG)
+ return -EINVAL;
+ map->format.format_reg = regmap_format_24_be;
+ return 0;
+
+ case 32:
+ switch (reg_endian) {
+ case REGMAP_ENDIAN_BIG:
+ map->format.format_reg = regmap_format_32_be;
+ return 0;
+ case REGMAP_ENDIAN_LITTLE:
+ map->format.format_reg = regmap_format_32_le;
+ return 0;
+ case REGMAP_ENDIAN_NATIVE:
+ map->format.format_reg = regmap_format_32_native;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+ }
+
+ return -EINVAL;
+}
+
+/* Pick format_val()/parse_val() for the value width and endianness. */
+static int regmap_set_val_format(struct regmap *map, const struct regmap_config *config,
+ enum regmap_endian val_endian)
+{
+ if (val_endian == REGMAP_ENDIAN_NATIVE)
+ map->format.parse_inplace = regmap_parse_inplace_noop;
+
+ switch (config->val_bits) {
+ case 8:
+ map->format.format_val = regmap_format_8;
+ map->format.parse_val = regmap_parse_8;
+ map->format.parse_inplace = regmap_parse_inplace_noop;
+ return 0;
+ case 16:
+ switch (val_endian) {
+ case REGMAP_ENDIAN_BIG:
+ map->format.format_val = regmap_format_16_be;
+ map->format.parse_val = regmap_parse_16_be;
+ map->format.parse_inplace = regmap_parse_16_be_inplace;
+ return 0;
+ case REGMAP_ENDIAN_LITTLE:
+ map->format.format_val = regmap_format_16_le;
+ map->format.parse_val = regmap_parse_16_le;
+ map->format.parse_inplace = regmap_parse_16_le_inplace;
+ return 0;
+ case REGMAP_ENDIAN_NATIVE:
+ map->format.format_val = regmap_format_16_native;
+ map->format.parse_val = regmap_parse_16_native;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+ case 24:
+ if (val_endian != REGMAP_ENDIAN_BIG)
+ return -EINVAL;
+ map->format.format_val = regmap_format_24_be;
+ map->format.parse_val = regmap_parse_24_be;
+ return 0;
+ case 32:
+ switch (val_endian) {
+ case REGMAP_ENDIAN_BIG:
+ map->format.format_val = regmap_format_32_be;
+ map->format.parse_val = regmap_parse_32_be;
+ map->format.parse_inplace = regmap_parse_32_be_inplace;
+ return 0;
+ case REGMAP_ENDIAN_LITTLE:
+ map->format.format_val = regmap_format_32_le;
+ map->format.parse_val = regmap_parse_32_le;
+ map->format.parse_inplace = regmap_parse_32_le_inplace;
+ return 0;
+ case REGMAP_ENDIAN_NATIVE:
+ map->format.format_val = regmap_format_32_native;
+ map->format.parse_val = regmap_parse_32_native;
+ return 0;
+ default:
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
+/*
+ * Set up the format/parse functions, cross-validate endianness,
+ * allocate the work buffer and select the bus write path.
+ */
+static int regmap_init_format(struct regmap *map,
+ const struct regmap_config *config,
+ enum regmap_endian reg_endian,
+ enum regmap_endian val_endian)
+{
+ int ret;
+
+ ret = regmap_set_reg_format(map, config, reg_endian);
+ if (ret)
+ return ret;
+
+ ret = regmap_set_val_format(map, config, val_endian);
+ if (ret)
+ return ret;
+
+ if (map->format.format_write) {
+ if (reg_endian != REGMAP_ENDIAN_BIG ||
+ val_endian != REGMAP_ENDIAN_BIG)
+ return -EINVAL;
+ map->use_single_write = true;
+ }
+
+ if (!map->format.format_write &&
+ !(map->format.format_reg && map->format.format_val))
+ return -EINVAL;
+
+ map->work_buf = kzalloc(map->format.buf_size, GFP_KERNEL);
+ if (map->work_buf == NULL)
+ return -ENOMEM;
+
+ if (map->format.format_write) {
+ map->defer_caching = false;
+ map->reg_write = _regmap_bus_formatted_write;
+ } else if (map->format.format_val) {
+ map->defer_caching = true;
+ map->reg_write = _regmap_bus_raw_write;
+ }
+
+ return 0;
+}
+
struct regmap *__regmap_init(struct device *dev,
const struct regmap_bus *bus,
void *bus_context,
@@ -854,7 +1045,6 @@ struct regmap *__regmap_init(struct device *dev,
const char *lock_name)
{
struct regmap *map;
- enum regmap_endian reg_endian, val_endian;
bool fast_io;
int ret;
@@ -879,8 +1069,6 @@ struct regmap *__regmap_init(struct device *dev,
if (ret)
goto err_name;
- ret = -EINVAL; /* Later error paths rely on this */
-
/*
* When we write in fast-paths with regmap_bulk_write() don't allocate
* scratch buffers with sleeping allocations.
@@ -956,22 +1144,23 @@ struct regmap *__regmap_init(struct device *dev,
map->read = config->read;
map->write = config->write;
- reg_endian = REGMAP_ENDIAN_NATIVE;
- val_endian = REGMAP_ENDIAN_NATIVE;
+ ret = regmap_init_format(map, config,
+ REGMAP_ENDIAN_NATIVE,
+ REGMAP_ENDIAN_NATIVE);
+ if (ret)
+ goto err_hwlock;
} else if (!bus) {
map->reg_read = config->reg_read;
map->reg_write = config->reg_write;
map->reg_update_bits = config->reg_update_bits;
map->defer_caching = false;
- goto skip_format_initialization;
} else if (!bus->read || !bus->write) {
map->reg_read = _regmap_bus_reg_read;
map->reg_write = _regmap_bus_reg_write;
map->reg_update_bits = bus->reg_update_bits;
map->defer_caching = false;
- goto skip_format_initialization;
} else {
map->reg_read = _regmap_bus_read;
map->reg_update_bits = bus->reg_update_bits;
@@ -979,201 +1168,13 @@ struct regmap *__regmap_init(struct device *dev,
map->read = bus->read;
map->write = bus->write;
- reg_endian = regmap_get_reg_endian(bus, config);
- val_endian = regmap_get_val_endian(dev, bus, config);
- }
-
- switch (config->reg_bits + map->reg_shift) {
- case 2:
- switch (config->val_bits) {
- case 6:
- map->format.format_write = regmap_format_2_6_write;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- case 4:
- switch (config->val_bits) {
- case 12:
- map->format.format_write = regmap_format_4_12_write;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- case 7:
- switch (config->val_bits) {
- case 9:
- map->format.format_write = regmap_format_7_9_write;
- break;
- case 17:
- map->format.format_write = regmap_format_7_17_write;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- case 10:
- switch (config->val_bits) {
- case 14:
- map->format.format_write = regmap_format_10_14_write;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- case 12:
- switch (config->val_bits) {
- case 20:
- map->format.format_write = regmap_format_12_20_write;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- case 8:
- map->format.format_reg = regmap_format_8;
- break;
-
- case 16:
- switch (reg_endian) {
- case REGMAP_ENDIAN_BIG:
- map->format.format_reg = regmap_format_16_be;
- break;
- case REGMAP_ENDIAN_LITTLE:
- map->format.format_reg = regmap_format_16_le;
- break;
- case REGMAP_ENDIAN_NATIVE:
- map->format.format_reg = regmap_format_16_native;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- case 24:
- switch (reg_endian) {
- case REGMAP_ENDIAN_BIG:
- map->format.format_reg = regmap_format_24_be;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- case 32:
- switch (reg_endian) {
- case REGMAP_ENDIAN_BIG:
- map->format.format_reg = regmap_format_32_be;
- break;
- case REGMAP_ENDIAN_LITTLE:
- map->format.format_reg = regmap_format_32_le;
- break;
- case REGMAP_ENDIAN_NATIVE:
- map->format.format_reg = regmap_format_32_native;
- break;
- default:
- goto err_hwlock;
- }
- break;
-
- default:
- goto err_hwlock;
- }
-
- if (val_endian == REGMAP_ENDIAN_NATIVE)
- map->format.parse_inplace = regmap_parse_inplace_noop;
-
- switch (config->val_bits) {
- case 8:
- map->format.format_val = regmap_format_8;
- map->format.parse_val = regmap_parse_8;
- map->format.parse_inplace = regmap_parse_inplace_noop;
- break;
- case 16:
- switch (val_endian) {
- case REGMAP_ENDIAN_BIG:
- map->format.format_val = regmap_format_16_be;
- map->format.parse_val = regmap_parse_16_be;
- map->format.parse_inplace = regmap_parse_16_be_inplace;
- break;
- case REGMAP_ENDIAN_LITTLE:
- map->format.format_val = regmap_format_16_le;
- map->format.parse_val = regmap_parse_16_le;
- map->format.parse_inplace = regmap_parse_16_le_inplace;
- break;
- case REGMAP_ENDIAN_NATIVE:
- map->format.format_val = regmap_format_16_native;
- map->format.parse_val = regmap_parse_16_native;
- break;
- default:
- goto err_hwlock;
- }
- break;
- case 24:
- switch (val_endian) {
- case REGMAP_ENDIAN_BIG:
- map->format.format_val = regmap_format_24_be;
- map->format.parse_val = regmap_parse_24_be;
- break;
- default:
- goto err_hwlock;
- }
- break;
- case 32:
- switch (val_endian) {
- case REGMAP_ENDIAN_BIG:
- map->format.format_val = regmap_format_32_be;
- map->format.parse_val = regmap_parse_32_be;
- map->format.parse_inplace = regmap_parse_32_be_inplace;
- break;
- case REGMAP_ENDIAN_LITTLE:
- map->format.format_val = regmap_format_32_le;
- map->format.parse_val = regmap_parse_32_le;
- map->format.parse_inplace = regmap_parse_32_le_inplace;
- break;
- case REGMAP_ENDIAN_NATIVE:
- map->format.format_val = regmap_format_32_native;
- map->format.parse_val = regmap_parse_32_native;
- break;
- default:
- goto err_hwlock;
- }
- break;
- }
-
- if (map->format.format_write) {
- if ((reg_endian != REGMAP_ENDIAN_BIG) ||
- (val_endian != REGMAP_ENDIAN_BIG))
+ ret = regmap_init_format(map, config,
+ regmap_get_reg_endian(bus, config),
+ regmap_get_val_endian(dev, bus, config));
+ if (ret)
goto err_hwlock;
- map->use_single_write = true;
- }
-
- if (!map->format.format_write &&
- !(map->format.format_reg && map->format.format_val))
- goto err_hwlock;
-
- map->work_buf = kzalloc(map->format.buf_size, GFP_KERNEL);
- if (map->work_buf == NULL) {
- ret = -ENOMEM;
- goto err_hwlock;
- }
-
- if (map->format.format_write) {
- map->defer_caching = false;
- map->reg_write = _regmap_bus_formatted_write;
- } else if (map->format.format_val) {
- map->defer_caching = true;
- map->reg_write = _regmap_bus_raw_write;
}
-skip_format_initialization:
ret = regmap_init_ranges(map, config);
if (ret)
--
2.56.0
next prev parent reply other threads:[~2026-11-13 15:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-13 15:31 [PATCH v2 00/10] regmap: clean up and improve __regmap_init() Peng Fan
2026-11-13 15:31 ` [PATCH v2 01/10] regmap: fix reinit cache failure handling Peng Fan
2026-11-13 15:31 ` [PATCH v2 02/10] regmap-i2c: keep bus raw write limit when applying read quirk Peng Fan
2026-11-13 15:31 ` [PATCH v2 03/10] regmap-i2c: fix write limit clamping for adapter quirks Peng Fan
2026-11-13 15:31 ` [PATCH v2 04/10] regmap: deduplicate fast_io checks Peng Fan
2026-11-13 15:31 ` [PATCH v2 05/10] regmap: factor out regmap_set_lock() Peng Fan
2026-11-13 15:31 ` [PATCH v2 06/10] regmap: factor out regmap_init_ranges() Peng Fan
2026-11-13 15:31 ` Peng Fan [this message]
2026-11-13 15:31 ` [PATCH v2 08/10] regmap: drop regmap_bus::free_on_exit Peng Fan
2026-11-13 15:31 ` [PATCH v2 09/10] regmap: use cleanup API in __regmap_init() Peng Fan
2026-11-13 15:31 ` [PATCH v2 10/10] regmap: kunit: add test for regmap_bus::init_limits Peng Fan
2026-11-14 13:01 ` [PATCH v2 00/10] regmap: clean up and improve __regmap_init() Peng Fan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261113-regmap-improve-v2-7-5dfd6a89078f@nxp.com \
--to=peng.fan@linux.dev \
--cc=broonie@kernel.org \
--cc=dakr@kernel.org \
--cc=driver-core@lists.linux.dev \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peng.fan@nxp.com \
--cc=rafael@kernel.org \
--cc=tanureal@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.