Skip to content

Commit

Permalink
gpio: make gpio_{request,free}_array gpio array parameter const
Browse files Browse the repository at this point in the history
gpio_{request,free}_array should not (and do not) modify the passed gpio
array, so make the parameter const.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Lars-Peter Clausen authored and Grant Likely committed May 27, 2011
1 parent 3474cb3 commit 7c29597
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions drivers/gpio/gpiolib.c
Original file line number Diff line number Diff line change
Expand Up @@ -1296,7 +1296,7 @@ EXPORT_SYMBOL_GPL(gpio_request_one);
* @array: array of the 'struct gpio'
* @num: how many GPIOs in the array
*/
int gpio_request_array(struct gpio *array, size_t num)
int gpio_request_array(const struct gpio *array, size_t num)
{
int i, err;

Expand All @@ -1319,7 +1319,7 @@ EXPORT_SYMBOL_GPL(gpio_request_array);
* @array: array of the 'struct gpio'
* @num: how many GPIOs in the array
*/
void gpio_free_array(struct gpio *array, size_t num)
void gpio_free_array(const struct gpio *array, size_t num)
{
while (num--)
gpio_free((array++)->gpio);
Expand Down
4 changes: 2 additions & 2 deletions include/asm-generic/gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ struct gpio {
};

extern int gpio_request_one(unsigned gpio, unsigned long flags, const char *label);
extern int gpio_request_array(struct gpio *array, size_t num);
extern void gpio_free_array(struct gpio *array, size_t num);
extern int gpio_request_array(const struct gpio *array, size_t num);
extern void gpio_free_array(const struct gpio *array, size_t num);

#ifdef CONFIG_GPIO_SYSFS

Expand Down
4 changes: 2 additions & 2 deletions include/linux/gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static inline int gpio_request_one(unsigned gpio,
return -ENOSYS;
}

static inline int gpio_request_array(struct gpio *array, size_t num)
static inline int gpio_request_array(const struct gpio *array, size_t num)
{
return -ENOSYS;
}
Expand All @@ -54,7 +54,7 @@ static inline void gpio_free(unsigned gpio)
WARN_ON(1);
}

static inline void gpio_free_array(struct gpio *array, size_t num)
static inline void gpio_free_array(const struct gpio *array, size_t num)
{
might_sleep();

Expand Down

0 comments on commit 7c29597

Please sign in to comment.