From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Jones Subject: [PATCH 1/3] drivers/gpio: devres.c: allow gpio array requests for managed devices Date: Tue, 10 Jun 2014 15:41:46 +0100 Message-ID: <1402411308-14182-2-git-send-email-rob.jones@codethink.co.uk> References: <1402411308-14182-1-git-send-email-rob.jones@codethink.co.uk> Return-path: Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:40145 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750740AbaFJOm7 (ORCPT ); Tue, 10 Jun 2014 10:42:59 -0400 In-Reply-To: <1402411308-14182-1-git-send-email-rob.jones@codethink.co.uk> Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: linus.walleij@linaro.org, gnurou@gmail.com Cc: lgirdwood@gmail.com, broonie@kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, ian.molton@codethink.co.uk, ben.dooks@codethink.co.uk, heiko@sntech.de, rob.jones@codethink.co.uk Add functions devm_gpio_request_array() and devm_gpio_free_array() which are exactly analogous to the equivalent non-managed device functions gpio_request_array() and gpio_free_array(), which can be found in module gpiolib.c. Note that if devm_gpio_request_array() fails, no gpios are obtained. No indication is provided as to which particular request failed. Reviewed-by: Ian Molton Signed-off-by: Rob Jones --- drivers/gpio/devres.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/gpio.h | 4 ++++ 2 files changed, 61 insertions(+) diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c index 307464f..fd95240d 100644 --- a/drivers/gpio/devres.c +++ b/drivers/gpio/devres.c @@ -186,6 +186,63 @@ int devm_gpio_request_one(struct device *dev, unsigned gpio, EXPORT_SYMBOL(devm_gpio_request_one); /** + * devm_gpio_request_array - request multiple GPIOs in a single call + * for a managed device + * @dev: device requesting the gpio + * @array: array of the 'struct gpio' + * @num: how many GPIOs in the array + * + * Except for the extra @dev argument, this function takes the + * same arguments and performs the same function as + * gpio_request(). GPIOs requested with this function will be + * automatically freed on driver detach. + * + * If GPIOs allocated with this function need to be freed separately, + * devm_gpio_free_array() or devm_gpio_free() must be used. + */ +int devm_gpio_request_array(struct device *dev, + const struct gpio *array, + size_t num) +{ + int i, err = 0; + + for (i = 0; i < num; i++, array++) { + err = devm_gpio_request_one(dev, + array->gpio, + array->flags, + array->label); + if (err) { + while (i--) + devm_gpio_free(dev, (--array)->gpio); + } + } + + return err; +} +EXPORT_SYMBOL(devm_gpio_request_array); + +/** + * devm_gpio_free_array - release multiple GPIOs in a single call + * for a managed device + * @dev: device requesting the gpio + * @array: array of the 'struct gpio' + * @num: how many GPIOs in the array + * + * Except for the extra @dev argument, this function takes the + * same arguments and performs the same function as gpio_free_array(). + * This function instead of gpio_free_array() should be used to + * manually free GPIOs allocated with devm_gpio_request(). + */ +void devm_gpio_free_array(struct device *dev, + const struct gpio *array, + size_t num) +{ + while (num--) + devm_gpio_free(dev, (array++)->gpio); +} +EXPORT_SYMBOL(devm_gpio_free_array); + +/** * devm_gpio_free - free a GPIO * @dev: device to free GPIO for * @gpio: GPIO to free diff --git a/include/linux/gpio.h b/include/linux/gpio.h index 85aa5d0..12d5648 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -84,6 +84,10 @@ struct device; int devm_gpio_request(struct device *dev, unsigned gpio, const char *label); int devm_gpio_request_one(struct device *dev, unsigned gpio, unsigned long flags, const char *label); +int devm_gpio_request_array(struct device *dev, const struct gpio *array, + size_t num); +void devm_gpio_free_array(struct device *dev, const struct gpio *array, + size_t num); void devm_gpio_free(struct device *dev, unsigned int gpio); #else /* ! CONFIG_GPIOLIB */ -- 1.7.10.4