Skip to content

Commit 37983fa

Browse files
svanheulebroonie
authored andcommitted
regmap: define cleanup helper for regmap_field
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@svanheule.net> Link: https://patch.msgid.link/20260220160112.543391-2-sander@svanheule.net Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 38ab655 commit 37983fa

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

include/linux/regmap.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*/
1212

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

1464+
DEFINE_FREE(regmap_field, struct regmap_field *, if (_T) regmap_field_free(_T))
1465+
14631466
struct regmap_field *devm_regmap_field_alloc(struct device *dev,
14641467
struct regmap *regmap, struct reg_field reg_field);
14651468
void devm_regmap_field_free(struct device *dev, struct regmap_field *field);

0 commit comments

Comments
 (0)