From 9d4b1b1e2dc206212badb2774285a8e43fe7542e Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Wed, 16 Jun 2010 06:12:13 +0100
Subject: [PATCH] --- yaml --- r: 201447 b: refs/heads/master c:
 f6aa01c2b8950a29503e93fc8b91f0d64f440c34 h: refs/heads/master i:   201445:
 039607031f271c3bba54bfd4d2b89434bc9b5842   201443:
 90599be006c61117cfba46b8792c29aa91093684   201439:
 e8b18f3b5f49a875bca250b51c508ab9dadf18bf v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/plat-nomadik/gpio.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index ff744d017e81..54494fdc3227 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d2aec9cd356254649fa2aa6bb5fb4d20cfded2c
+refs/heads/master: f6aa01c2b8950a29503e93fc8b91f0d64f440c34
diff --git a/trunk/arch/arm/plat-nomadik/gpio.c b/trunk/arch/arm/plat-nomadik/gpio.c
index 1e0e9130e51e..977c8f9a07a2 100644
--- a/trunk/arch/arm/plat-nomadik/gpio.c
+++ b/trunk/arch/arm/plat-nomadik/gpio.c
@@ -619,30 +619,12 @@ static int __init nmk_gpio_probe(struct platform_device *dev)
 	return ret;
 }
 
-static int __exit nmk_gpio_remove(struct platform_device *dev)
-{
-	struct nmk_gpio_chip *nmk_chip;
-	struct resource *res;
-
-	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-
-	nmk_chip = platform_get_drvdata(dev);
-	gpiochip_remove(&nmk_chip->chip);
-	clk_disable(nmk_chip->clk);
-	clk_put(nmk_chip->clk);
-	kfree(nmk_chip);
-	release_mem_region(res->start, resource_size(res));
-	return 0;
-}
-
-
 static struct platform_driver nmk_gpio_driver = {
 	.driver = {
 		.owner = THIS_MODULE,
 		.name = "gpio",
 		},
 	.probe = nmk_gpio_probe,
-	.remove = __exit_p(nmk_gpio_remove),
 	.suspend = NULL, /* to be done */
 	.resume = NULL,
 };