ARM: OMAP1: ams-delta: Don't request unused GPIOs

[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / board-ams-delta.c

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 647512ef095c2efdd664944f3b46f53a04ad512b..318925ae3ebe3c811caf791e6bb08debfbec38a8 100644 (file)
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -250,39 +250,6 @@ static struct platform_device latch2_gpio_device = {
 #define LATCH2_PIN_HOOKFLASH1          14
 #define LATCH2_PIN_HOOKFLASH2          15
 
 #define LATCH2_PIN_HOOKFLASH1          14
 #define LATCH2_PIN_HOOKFLASH2          15
 

-static const struct gpio latch_gpios[] __initconst = {
-       {
-               .gpio   = LATCH1_GPIO_BASE + 6,
-               .flags  = GPIOF_OUT_INIT_LOW,
-               .label  = "dockit1",
-       },
-       {
-               .gpio   = LATCH1_GPIO_BASE + 7,
-               .flags  = GPIOF_OUT_INIT_LOW,
-               .label  = "dockit2",
-       },
-       {
-               .gpio   = AMS_DELTA_GPIO_PIN_SCARD_RSTIN,
-               .flags  = GPIOF_OUT_INIT_LOW,
-               .label  = "scard_rstin",
-       },
-       {
-               .gpio   = AMS_DELTA_GPIO_PIN_SCARD_CMDVCC,
-               .flags  = GPIOF_OUT_INIT_LOW,
-               .label  = "scard_cmdvcc",
-       },
-       {
-               .gpio   = AMS_DELTA_LATCH2_GPIO_BASE + 14,
-               .flags  = GPIOF_OUT_INIT_LOW,
-               .label  = "hookflash1",
-       },
-       {
-               .gpio   = AMS_DELTA_LATCH2_GPIO_BASE + 15,
-               .flags  = GPIOF_OUT_INIT_LOW,
-               .label  = "hookflash2",
-       },
-};
-

 static struct regulator_consumer_supply modem_nreset_consumers[] = {
        REGULATOR_SUPPLY("RESET#", "serial8250.1"),
        REGULATOR_SUPPLY("POR", "cx20442-codec"),
 static struct regulator_consumer_supply modem_nreset_consumers[] = {
        REGULATOR_SUPPLY("RESET#", "serial8250.1"),
        REGULATOR_SUPPLY("POR", "cx20442-codec"),


@@ -862,7 +829,6 @@ static void __init ams_delta_led_init(struct gpio_chip *chip)
 static int __init ams_delta_gpio_init(void)
 {
        struct gpio_chip *chip;
 static int __init ams_delta_gpio_init(void)
 {
        struct gpio_chip *chip;

-       int err;

 
        if (!machine_is_ams_delta())
                return -ENODEV;
 
        if (!machine_is_ams_delta())
                return -ENODEV;


@@ -873,11 +839,7 @@ static int __init ams_delta_gpio_init(void)
        else
                ams_delta_led_init(chip);
 
        else
                ams_delta_led_init(chip);
 

-       err = gpio_request_array(latch_gpios, ARRAY_SIZE(latch_gpios));
-       if (err)
-               pr_err("Couldn't take over latch1/latch2 GPIO pins\n");
-
-       return err;
+       return 0;

 }
 device_initcall_sync(ams_delta_gpio_init);
 
 }
 device_initcall_sync(ams_delta_gpio_init);