Remove extra code in arch/arm/*omap* to move it into omap-pool branch

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-h2-mmc.c

diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index 46098f546824853499151687cb1f7bd46fc45a83..44d4a966bed9b3aa4c6ea06efa678396f641ae52 100644 (file)
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -26,13 +26,19 @@
 static int mmc_set_power(struct device *dev, int slot, int power_on,
                                int vdd)
 {
-       gpio_set_value(H2_TPS_GPIO_MMC_PWR_EN, power_on);
+       if (power_on)
+               gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 1);
+       else
+               gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 0);
+
        return 0;
 }
 
 static int mmc_late_init(struct device *dev)
 {
-       int ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power");
+       int ret;
+
+       ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power");
        if (ret < 0)
                return ret;
 
@@ -41,7 +47,7 @@ static int mmc_late_init(struct device *dev)
        return ret;
 }
 
-static void mmc_cleanup(struct device *dev)
+static void mmc_shutdown(struct device *dev)
 {
        gpio_free(H2_TPS_GPIO_MMC_PWR_EN);
 }
@@ -54,7 +60,7 @@ static void mmc_cleanup(struct device *dev)
 static struct omap_mmc_platform_data mmc1_data = {
        .nr_slots                       = 1,
        .init                           = mmc_late_init,
-       .cleanup                        = mmc_cleanup,
+       .shutdown                       = mmc_shutdown,
        .dma_mask                       = 0xffffffff,
        .slots[0]       = {
                .set_power              = mmc_set_power,