* [PATCH] regulator: Constify the pointer to alias name array
@ 2014-05-23 15:44 Lee Jones
2014-05-23 17:55 ` Mark Brown
2014-05-27 9:26 ` Lee Jones
0 siblings, 2 replies; 3+ messages in thread
From: Lee Jones @ 2014-05-23 15:44 UTC (permalink / raw)
To: linux-arm-kernel
Toughen-up checks for read-only regulator names.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/regulator/core.c | 7 ++++---
drivers/regulator/devres.c | 6 +++---
include/linux/mfd/core.h | 2 +-
include/linux/regulator/consumer.h | 36 ++++++++++++++++++++----------------
4 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3c..ba28d29 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -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;
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index f44818b..8f785bc 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -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;
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index bdba8c6..f543de9 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -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;
};
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 1a4a8c1..ccd3d77 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -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,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)
{
}
@@ -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)
{
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] regulator: Constify the pointer to alias name array
2014-05-23 15:44 [PATCH] regulator: Constify the pointer to alias name array Lee Jones
@ 2014-05-23 17:55 ` Mark Brown
2014-05-27 9:26 ` Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2014-05-23 17:55 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, May 23, 2014 at 04:44:10PM +0100, Lee Jones wrote:
> Toughen-up checks for read-only regulator names.
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/4b2b2935/attachment-0001.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] regulator: Constify the pointer to alias name array
2014-05-23 15:44 [PATCH] regulator: Constify the pointer to alias name array Lee Jones
2014-05-23 17:55 ` Mark Brown
@ 2014-05-27 9:26 ` Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2014-05-27 9:26 UTC (permalink / raw)
To: linux-arm-kernel
Sorry Joe, I left you off this one by mistake.
This has now been applied by Mark.
> Toughen-up checks for read-only regulator names.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/regulator/core.c | 7 ++++---
> drivers/regulator/devres.c | 6 +++---
> include/linux/mfd/core.h | 2 +-
> include/linux/regulator/consumer.h | 36 ++++++++++++++++++++----------------
> 4 files changed, 28 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index 9a09f3c..ba28d29 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -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;
> diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
> index f44818b..8f785bc 100644
> --- a/drivers/regulator/devres.c
> +++ b/drivers/regulator/devres.c
> @@ -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;
> diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
> index bdba8c6..f543de9 100644
> --- a/include/linux/mfd/core.h
> +++ b/include/linux/mfd/core.h
> @@ -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;
> };
>
> diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
> index 1a4a8c1..ccd3d77 100644
> --- a/include/linux/regulator/consumer.h
> +++ b/include/linux/regulator/consumer.h
> @@ -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,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)
> {
> }
>
> @@ -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)
> {
> }
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-27 9:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-23 15:44 [PATCH] regulator: Constify the pointer to alias name array Lee Jones
2014-05-23 17:55 ` Mark Brown
2014-05-27 9:26 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).