Commit 9f8c0fe9 authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files

regulator: Constify the pointer to alias name array 



Toughen-up checks for read-only regulator names.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c9eaa447

drivers/regulator/core.c

+4 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;

drivers/regulator/devres.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;

include/linux/mfd/core.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};

include/linux/regulator/consumer.h

+20 −16
Original line number Diff line number Diff line
@@ -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,
@@ -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 */
@@ -290,16 +292,16 @@ static inline void regulator_unregister_supply_alias(struct device *dev, 
}



static inline int 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)

{

	return 0;

}



static inline void regulator_bulk_unregister_supply_alias(struct device *dev,

							  const char **id,

						const char * const *id,

						int num_id)

{

}
@@ -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)

{

}