From 263dc346d3d4fea131a15caf3fc5ba050c2bbc64 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Tue, 21 Jun 2011 14:49:37 -0300
Subject: [PATCH] --- yaml --- r: 258639 b: refs/heads/master c:
 581f84e24b45ab871ae5f15f9290261c7226ffa9 h: refs/heads/master i:   258637:
 176cd018c633462e2b1d89df32aa2d01bf41c23b   258635:
 6d4a1f5a8a637fce1b6c9bb5d33b2a88a5bb2418   258631:
 8e2ddd0a6f719d0525f7c51cd5bc757a6fd3bbd0   258623:
 65bcdb3601018180026d156283b1090d22412c25 v: v3

---
 [refs]                                        |  2 +-
 .../arch/arm/plat-mxc/include/mach/iomux-v1.h |  1 -
 trunk/arch/arm/plat-mxc/iomux-v1.c            | 32 -------------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index df8cbe5389aa..5ffeca5f009f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2a08e3e46f594ad605c9b5f5fce6b9f36a9a3eb
+refs/heads/master: 581f84e24b45ab871ae5f15f9290261c7226ffa9
diff --git a/trunk/arch/arm/plat-mxc/include/mach/iomux-v1.h b/trunk/arch/arm/plat-mxc/include/mach/iomux-v1.h
index c07d30210c57..253d64d686f8 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/iomux-v1.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/iomux-v1.h
@@ -98,7 +98,6 @@
 extern int mxc_gpio_mode(int gpio_mode);
 extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
 		const char *label);
-extern void mxc_gpio_release_multiple_pins(const int *pin_list, int count);
 
 extern int __init imx_iomuxv1_init(void __iomem *base, int numports);
 
diff --git a/trunk/arch/arm/plat-mxc/iomux-v1.c b/trunk/arch/arm/plat-mxc/iomux-v1.c
index 3238c10d4e02..d76f3ac25e5d 100644
--- a/trunk/arch/arm/plat-mxc/iomux-v1.c
+++ b/trunk/arch/arm/plat-mxc/iomux-v1.c
@@ -172,45 +172,13 @@ static int imx_iomuxv1_setup_multiple(const int *list, unsigned count)
 int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
 		const char *label)
 {
-	size_t i;
 	int ret;
 
-	for (i = 0; i < count; ++i) {
-		unsigned gpio = pin_list[i] & (GPIO_PIN_MASK | GPIO_PORT_MASK);
-
-		ret = gpio_request(gpio, label);
-		if (ret)
-			goto err_gpio_request;
-	}
-
 	ret = imx_iomuxv1_setup_multiple(pin_list, count);
-	if (ret)
-		goto err_setup;
-
-	return 0;
-
-err_setup:
-	BUG_ON(i != count);
-
-err_gpio_request:
-	mxc_gpio_release_multiple_pins(pin_list, i);
-
 	return ret;
 }
 EXPORT_SYMBOL(mxc_gpio_setup_multiple_pins);
 
-void mxc_gpio_release_multiple_pins(const int *pin_list, int count)
-{
-	size_t i;
-
-	for (i = 0; i < count; ++i) {
-		unsigned gpio = pin_list[i] & (GPIO_PIN_MASK | GPIO_PORT_MASK);
-
-		gpio_free(gpio);
-	}
-}
-EXPORT_SYMBOL(mxc_gpio_release_multiple_pins);
-
 int __init imx_iomuxv1_init(void __iomem *base, int numports)
 {
 	imx_iomuxv1_baseaddr = base;