Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c295975 authored May 25, 2011 by Lars-Peter Clausen Committed by Grant Likely May 27, 2011

gpio: make gpio_{request,free}_array gpio array parameter const



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>

parent 3474cb3c

drivers/gpio/gpiolib.c

+2 −2

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

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

include/asm-generic/gpio.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

include/linux/gpio.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		@@ -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();