Skip to content

Commit 9f8c0fe

Browse files
Lee Jonesbroonie
Lee Jones
authored and
broonie
committed
regulator: Constify the pointer to alias name array
Toughen-up checks for read-only regulator names. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent c9eaa44 commit 9f8c0fe

File tree

4 files changed

+28
-23
lines changed

4 files changed

+28
-23
lines changed

‎drivers/regulator/core.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,9 +1597,10 @@ EXPORT_SYMBOL_GPL(regulator_unregister_supply_alias);
15971597
* registered any aliases that were registered will be removed
15981598
* before returning to the caller.
15991599
*/
1600-
int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
1600+
int regulator_bulk_register_supply_alias(struct device *dev,
1601+
const char *const *id,
16011602
struct device *alias_dev,
1602-
const char **alias_id,
1603+
const char *const *alias_id,
16031604
int num_id)
16041605
{
16051606
int i;
@@ -1637,7 +1638,7 @@ EXPORT_SYMBOL_GPL(regulator_bulk_register_supply_alias);
16371638
* aliases in one operation.
16381639
*/
16391640
void regulator_bulk_unregister_supply_alias(struct device *dev,
1640-
const char **id,
1641+
const char *const *id,
16411642
int num_id)
16421643
{
16431644
int i;

‎drivers/regulator/devres.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ EXPORT_SYMBOL_GPL(devm_regulator_unregister_supply_alias);
360360
* will be removed before returning to the caller.
361361
*/
362362
int devm_regulator_bulk_register_supply_alias(struct device *dev,
363-
const char **id,
363+
const char *const *id,
364364
struct device *alias_dev,
365-
const char **alias_id,
365+
const char *const *alias_id,
366366
int num_id)
367367
{
368368
int i;
@@ -404,7 +404,7 @@ EXPORT_SYMBOL_GPL(devm_regulator_bulk_register_supply_alias);
404404
* will ensure that the resource is freed.
405405
*/
406406
void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
407-
const char **id,
407+
const char *const *id,
408408
int num_id)
409409
{
410410
int i;

‎include/linux/mfd/core.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct mfd_cell {
6363
/* A list of regulator supplies that should be mapped to the MFD
6464
* device rather than the child device when requested
6565
*/
66-
const char **parent_supplies;
66+
const char * const *parent_supplies;
6767
int num_parent_supplies;
6868
};
6969

‎include/linux/regulator/consumer.h‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,13 @@ int regulator_register_supply_alias(struct device *dev, const char *id,
151151
const char *alias_id);
152152
void regulator_unregister_supply_alias(struct device *dev, const char *id);
153153

154-
int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
154+
int regulator_bulk_register_supply_alias(struct device *dev,
155+
const char *const *id,
155156
struct device *alias_dev,
156-
const char **alias_id, int num_id);
157+
const char *const *alias_id,
158+
int num_id);
157159
void regulator_bulk_unregister_supply_alias(struct device *dev,
158-
const char **id, int num_id);
160+
const char * const *id, int num_id);
159161

160162
int devm_regulator_register_supply_alias(struct device *dev, const char *id,
161163
struct device *alias_dev,
@@ -164,12 +166,12 @@ void devm_regulator_unregister_supply_alias(struct device *dev,
164166
const char *id);
165167

166168
int devm_regulator_bulk_register_supply_alias(struct device *dev,
167-
const char **id,
169+
const char *const *id,
168170
struct device *alias_dev,
169-
const char **alias_id,
171+
const char *const *alias_id,
170172
int num_id);
171173
void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
172-
const char **id,
174+
const char *const *id,
173175
int num_id);
174176

175177
/* regulator output control and status */
@@ -290,17 +292,17 @@ static inline void regulator_unregister_supply_alias(struct device *dev,
290292
}
291293

292294
static inline int regulator_bulk_register_supply_alias(struct device *dev,
293-
const char **id,
294-
struct device *alias_dev,
295-
const char **alias_id,
296-
int num_id)
295+
const char *const *id,
296+
struct device *alias_dev,
297+
const char * const *alias_id,
298+
int num_id)
297299
{
298300
return 0;
299301
}
300302

301303
static inline void regulator_bulk_unregister_supply_alias(struct device *dev,
302-
const char **id,
303-
int num_id)
304+
const char * const *id,
305+
int num_id)
304306
{
305307
}
306308

@@ -317,15 +319,17 @@ static inline void devm_regulator_unregister_supply_alias(struct device *dev,
317319
{
318320
}
319321

320-
static inline int devm_regulator_bulk_register_supply_alias(
321-
struct device *dev, const char **id, struct device *alias_dev,
322-
const char **alias_id, int num_id)
322+
static inline int devm_regulator_bulk_register_supply_alias(struct device *dev,
323+
const char *const *id,
324+
struct device *alias_dev,
325+
const char *const *alias_id,
326+
int num_id)
323327
{
324328
return 0;
325329
}
326330

327331
static inline void devm_regulator_bulk_unregister_supply_alias(
328-
struct device *dev, const char **id, int num_id)
332+
struct device *dev, const char *const *id, int num_id)
329333
{
330334
}
331335

0 commit comments

Comments
 (0)