Skip to content

Commit

Permalink
regulator: Constify the pointer to alias name array
Browse files Browse the repository at this point in the history 
Toughen-up checks for read-only regulator names.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Lee Jones authored and Mark Brown committed May 23, 2014
1 parent c9eaa44 commit 9f8c0fe
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 23 deletions.
7 changes: 4 additions & 3 deletions drivers/regulator/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1597,9 +1597,10 @@ EXPORT_SYMBOL_GPL(regulator_unregister_supply_alias);
* registered any aliases that were registered will be removed
* before returning to the caller.
*/
int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
int regulator_bulk_register_supply_alias(struct device *dev,
const char *const *id,
struct device *alias_dev,
const char **alias_id,
const char *const *alias_id,
int num_id)
{
int i;
Expand Down Expand Up @@ -1637,7 +1638,7 @@ EXPORT_SYMBOL_GPL(regulator_bulk_register_supply_alias);
* aliases in one operation.
*/
void regulator_bulk_unregister_supply_alias(struct device *dev,
const char **id,
const char *const *id,
int num_id)
{
int i;
Expand Down
6 changes: 3 additions & 3 deletions drivers/regulator/devres.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ EXPORT_SYMBOL_GPL(devm_regulator_unregister_supply_alias);
* will be removed before returning to the caller.
*/
int devm_regulator_bulk_register_supply_alias(struct device *dev,
const char **id,
const char *const *id,
struct device *alias_dev,
const char **alias_id,
const char *const *alias_id,
int num_id)
{
int i;
Expand Down Expand Up @@ -404,7 +404,7 @@ EXPORT_SYMBOL_GPL(devm_regulator_bulk_register_supply_alias);
* will ensure that the resource is freed.
*/
void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
const char **id,
const char *const *id,
int num_id)
{
int i;
Expand Down
2 changes: 1 addition & 1 deletion include/linux/mfd/core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ struct mfd_cell {
/* A list of regulator supplies that should be mapped to the MFD
* device rather than the child device when requested
*/
const char **parent_supplies;
const char * const *parent_supplies;
int num_parent_supplies;
};

Expand Down
36 changes: 20 additions & 16 deletions include/linux/regulator/consumer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,13 @@ int regulator_register_supply_alias(struct device *dev, const char *id,
const char *alias_id);
void regulator_unregister_supply_alias(struct device *dev, const char *id);

int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
int regulator_bulk_register_supply_alias(struct device *dev,
const char *const *id,
struct device *alias_dev,
const char **alias_id, int num_id);
const char *const *alias_id,
int num_id);
void regulator_bulk_unregister_supply_alias(struct device *dev,
const char **id, int num_id);
const char * const *id, int num_id);

int devm_regulator_register_supply_alias(struct device *dev, const char *id,
struct device *alias_dev,
Expand All @@ -164,12 +166,12 @@ void devm_regulator_unregister_supply_alias(struct device *dev,
const char *id);

int devm_regulator_bulk_register_supply_alias(struct device *dev,
const char **id,
const char *const *id,
struct device *alias_dev,
const char **alias_id,
const char *const *alias_id,
int num_id);
void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
const char **id,
const char *const *id,
int num_id);

/* regulator output control and status */
Expand Down Expand Up @@ -290,17 +292,17 @@ static inline void regulator_unregister_supply_alias(struct device *dev,
}

static inline int regulator_bulk_register_supply_alias(struct device *dev,
const char **id,
struct device *alias_dev,
const char **alias_id,
int num_id)
const char *const *id,
struct device *alias_dev,
const char * const *alias_id,
int num_id)
{
return 0;
}

static inline void regulator_bulk_unregister_supply_alias(struct device *dev,
const char **id,
int num_id)
const char * const *id,
int num_id)
{
}

Expand All @@ -317,15 +319,17 @@ static inline void devm_regulator_unregister_supply_alias(struct device *dev,
{
}

static inline int devm_regulator_bulk_register_supply_alias(
struct device *dev, const char **id, struct device *alias_dev,
const char **alias_id, int num_id)
static inline int devm_regulator_bulk_register_supply_alias(struct device *dev,
const char *const *id,
struct device *alias_dev,
const char *const *alias_id,
int num_id)
{
return 0;
}

static inline void devm_regulator_bulk_unregister_supply_alias(
struct device *dev, const char **id, int num_id)
struct device *dev, const char *const *id, int num_id)
{
}

Expand Down

0 comments on commit 9f8c0fe

Please sign in to comment.