Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755339Ab0GZUiF (ORCPT ); Mon, 26 Jul 2010 16:38:05 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:14744 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752362Ab0GZUiB (ORCPT ); Mon, 26 Jul 2010 16:38:01 -0400 X-IronPort-AV: E=McAfee;i="5400,1158,6055"; a="48698757" From: Gregory Bean To: dwalker@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Gregory Bean Subject: [PATCH] msm: complete implementation of gpio utility functions. Date: Mon, 26 Jul 2010 13:37:58 -0700 Message-Id: <1280176678-18855-1-git-send-email-gbean@codeaurora.org> X-Mailer: git-send-email 1.7.0.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1992 Lines: 73 Implement the second half of the gpio_request_enable and gpio_disable_free gpio/tlmm utility functions, now that gpiolib has found its way to the MSM/QSD. Now these functions actually request and free, like they claim to. Signed-off-by: Gregory Bean --- arch/arm/mach-msm/gpio.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-msm/gpio.c b/arch/arm/mach-msm/gpio.c index bc32c84..796990f 100644 --- a/arch/arm/mach-msm/gpio.c +++ b/arch/arm/mach-msm/gpio.c @@ -71,15 +71,47 @@ void msm_gpios_disable(const struct msm_gpio *table, int size) } EXPORT_SYMBOL(msm_gpios_disable); +int msm_gpios_request(const struct msm_gpio *table, int size) +{ + int i, result; + + for (i = 0; i < size; ++i) { + result = gpio_request(GPIO_PIN(table[i].gpio_cfg), + table[i].label); + if (result < 0) + goto err; + } + + return 0; +err: + msm_gpios_free(table, i); + return result; +} +EXPORT_SYMBOL(msm_gpios_request); + +void msm_gpios_free(const struct msm_gpio *table, int size) +{ + int i; + + for (i = 0; i < size; ++i) + gpio_free(GPIO_PIN(table[i].gpio_cfg)); +} +EXPORT_SYMBOL(msm_gpios_free); + int msm_gpios_request_enable(const struct msm_gpio *table, int size) { int rc = msm_gpios_enable(table, size); + + if (rc == 0) + rc = msm_gpios_request(table, size); + return rc; } EXPORT_SYMBOL(msm_gpios_request_enable); void msm_gpios_disable_free(const struct msm_gpio *table, int size) { + msm_gpios_free(table, size); msm_gpios_disable(table, size); } EXPORT_SYMBOL(msm_gpios_disable_free); -- 1.7.0.4 -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/