[PATCH v2 2/2] regmap: define cleanup helper for regmap_field

From: Sander Vanheule

Date: Fri Feb 20 2026 - 11:01:44 EST


For temporary field allocation, the user has to perform manual cleanup,
or rely on devm_regmap_field_alloc() to (eventually) clean up the
allocated resources when an error occurs.

Add a cleanup helper that takes care of freeing the allocated
regmap_field whenever it goes out of scope.

This can simplify this example:

struct regmap_field *field = regmap_field_alloc(...);
if (IS_ERR(field))
return PTR_ERR(field);

int err = regmap_field_read(...);
if (err)
goto out;

/* some logic that may also error */

err = regmap_field_write(...);

out:
regmap_field_free(field);

return err;

into the shorter:

struct regmap_field *field __free(regmap_field) = regmap_field_alloc(...);
if (IS_ERR(field))
return PTR_ERR(field);

int err = regmap_field_read(...);
if (err)
return err;

/* some logic that may also error */

return regmap_field_write(...);

Signed-off-by: Sander Vanheule <sander@xxxxxxxxxxxxx>
---
Changes since v1:
- Fix error handling of regmap_field_alloc() in example
- Make example less trivial
---
include/linux/regmap.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index c8a6a05bdba1..f1c5cb63c171 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -11,6 +11,7 @@
*/

#include <linux/bug.h>
+#include <linux/cleanup.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/fwnode.h>
@@ -1460,6 +1461,8 @@ struct regmap_field *regmap_field_alloc(struct regmap *regmap,
struct reg_field reg_field);
void regmap_field_free(struct regmap_field *field);

+DEFINE_FREE(regmap_field, struct regmap_field *, if (_T) regmap_field_free(_T))
+
struct regmap_field *devm_regmap_field_alloc(struct device *dev,
struct regmap *regmap, struct reg_field reg_field);
void devm_regmap_field_free(struct device *dev, struct regmap_field *field);
--
2.53.0