diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-24 22:15:48 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-24 22:15:48 +0100 |
| commit | 0df283639d7f6aa8948516aabf0c48b4b486cda1 (patch) | |
| tree | 241c67ce212acd91a8cdeb22cced135e7f5e275e /arch/arm/mach-omap1/board-h2-mmc.c | |
| parent | 9f5a691253924fd033a58c6b1fed57bb0a4eccf4 (diff) | |
| parent | 535ff672e3589a38f60567314bc2ae15b9ab2604 (diff) | |
| download | kernel_samsung_espresso10-0df283639d7f6aa8948516aabf0c48b4b486cda1.zip kernel_samsung_espresso10-0df283639d7f6aa8948516aabf0c48b4b486cda1.tar.gz kernel_samsung_espresso10-0df283639d7f6aa8948516aabf0c48b4b486cda1.tar.bz2 | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/mach-omap1/board-h2-mmc.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-h2-mmc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c index 44d4a96..46098f5 100644 --- a/arch/arm/mach-omap1/board-h2-mmc.c +++ b/arch/arm/mach-omap1/board-h2-mmc.c @@ -26,19 +26,13 @@ static int mmc_set_power(struct device *dev, int slot, int power_on, int vdd) { - if (power_on) - gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 1); - else - gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 0); - + gpio_set_value(H2_TPS_GPIO_MMC_PWR_EN, power_on); return 0; } static int mmc_late_init(struct device *dev) { - int ret; - - ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power"); + int ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power"); if (ret < 0) return ret; @@ -47,7 +41,7 @@ static int mmc_late_init(struct device *dev) return ret; } -static void mmc_shutdown(struct device *dev) +static void mmc_cleanup(struct device *dev) { gpio_free(H2_TPS_GPIO_MMC_PWR_EN); } @@ -60,7 +54,7 @@ static void mmc_shutdown(struct device *dev) static struct omap_mmc_platform_data mmc1_data = { .nr_slots = 1, .init = mmc_late_init, - .shutdown = mmc_shutdown, + .cleanup = mmc_cleanup, .dma_mask = 0xffffffff, .slots[0] = { .set_power = mmc_set_power, |