diff options
| author | Icenowy Zheng <icenowy@sipeed.com> | 2021-08-02 14:37:41 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-08-02 12:21:32 +0100 |
| commit | 29c34975c9391d3ad1fd5dd3c92ba0d41afe9549 (patch) | |
| tree | a4d160a69cc6ef1b539603a8ad4856be9a0f3d68 | |
| parent | d63aa09f7c53bdeb83edb4d84c07d759a92223bb (diff) | |
regmap: allow const array for {devm_,}regmap_field_bulk_alloc reg_fields
The reg_fields array fed to {devm_}regmap_field_bulk_alloc is currently
not const, which is not correct on semantics (the functions shouldn't
change reg_field contents) and prevents pre-defined const reg_field
array to be used.
As the implementation of this function doesn't change the content of it,
just add const to its prototype.
Signed-off-by: Icenowy Zheng <icenowy@sipeed.com>
Link: https://lore.kernel.org/r/20210802063741.76301-1-icenowy@sipeed.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/base/regmap/regmap.c | 4 | ||||
| -rw-r--r-- | include/linux/regmap.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index dcfa99ea7f31..6ad41d0720ba 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1298,7 +1298,7 @@ EXPORT_SYMBOL_GPL(devm_regmap_field_alloc); */ int regmap_field_bulk_alloc(struct regmap *regmap, struct regmap_field **rm_field, - struct reg_field *reg_field, + const struct reg_field *reg_field, int num_fields) { struct regmap_field *rf; @@ -1334,7 +1334,7 @@ EXPORT_SYMBOL_GPL(regmap_field_bulk_alloc); int devm_regmap_field_bulk_alloc(struct device *dev, struct regmap *regmap, struct regmap_field **rm_field, - struct reg_field *reg_field, + const struct reg_field *reg_field, int num_fields) { struct regmap_field *rf; diff --git a/include/linux/regmap.h b/include/linux/regmap.h index f5f08dd0a116..77755196277c 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -1269,12 +1269,13 @@ void devm_regmap_field_free(struct device *dev, struct regmap_field *field); int regmap_field_bulk_alloc(struct regmap *regmap, struct regmap_field **rm_field, - struct reg_field *reg_field, + const struct reg_field *reg_field, int num_fields); void regmap_field_bulk_free(struct regmap_field *field); int devm_regmap_field_bulk_alloc(struct device *dev, struct regmap *regmap, struct regmap_field **field, - struct reg_field *reg_field, int num_fields); + const struct reg_field *reg_field, + int num_fields); void devm_regmap_field_bulk_free(struct device *dev, struct regmap_field *field); |