lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap: Fix n8x0 mmc_mmc_init compile warnings and typos

Browse Source 
Fix warning: 'return' with a value, in function returning void
in n8x0_mmc_init. Also fix a search and replace typo.

Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren
2010-04-21 15:27:24 -07:00
parent 67d24820c2
commit 1dea5c6b58
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/mach-omap2/board-n8x0.c
View File

@@ -216,7 +216,7 @@ static void __init n8x0_onenand_init(void) {}
*/ */
#define N8X0_SLOT_SWITCH_GPIO 96 #define N8X0_SLOT_SWITCH_GPIO 96
#define N810_EMMC_VSD_GPIO 23 #define N810_EMMC_VSD_GPIO 23
#define NN810_EMMC_VIO_GPIO 9 #define N810_EMMC_VIO_GPIO 9
static int n8x0_mmc_switch_slot(struct device *dev, int slot) static int n8x0_mmc_switch_slot(struct device *dev, int slot)
{ {
@@ -304,10 +304,10 @@ static void n810_set_power_emmc(struct device *dev,
if (power_on) { if (power_on) {
gpio_set_value(N810_EMMC_VSD_GPIO, 1); gpio_set_value(N810_EMMC_VSD_GPIO, 1);
msleep(1); msleep(1);
gpio_set_value(NN810_EMMC_VIO_GPIO, 1); gpio_set_value(N810_EMMC_VIO_GPIO, 1);
msleep(1); msleep(1);
} else { } else {
gpio_set_value(NN810_EMMC_VIO_GPIO, 0); gpio_set_value(N810_EMMC_VIO_GPIO, 0);
msleep(50); msleep(50);
gpio_set_value(N810_EMMC_VSD_GPIO, 0); gpio_set_value(N810_EMMC_VSD_GPIO, 0);
msleep(50); msleep(50);
@@ -468,7 +468,7 @@ static void n8x0_mmc_cleanup(struct device *dev)
if (machine_is_nokia_n810()) { if (machine_is_nokia_n810()) {
gpio_free(N810_EMMC_VSD_GPIO); gpio_free(N810_EMMC_VSD_GPIO);
gpio_free(NN810_EMMC_VIO_GPIO); gpio_free(N810_EMMC_VIO_GPIO);
} }
} }
@@ -529,7 +529,7 @@ void __init n8x0_mmc_init(void)
err = gpio_request(N8X0_SLOT_SWITCH_GPIO, "MMC slot switch"); err = gpio_request(N8X0_SLOT_SWITCH_GPIO, "MMC slot switch");
if (err) if (err)
return err; return;
gpio_direction_output(N8X0_SLOT_SWITCH_GPIO, 0); gpio_direction_output(N8X0_SLOT_SWITCH_GPIO, 0);
@@ -537,17 +537,17 @@ void __init n8x0_mmc_init(void)
err = gpio_request(N810_EMMC_VSD_GPIO, "MMC slot 2 Vddf"); err = gpio_request(N810_EMMC_VSD_GPIO, "MMC slot 2 Vddf");
if (err) { if (err) {
gpio_free(N8X0_SLOT_SWITCH_GPIO); gpio_free(N8X0_SLOT_SWITCH_GPIO);
return err; return;
} }
gpio_direction_output(N810_EMMC_VSD_GPIO, 0); gpio_direction_output(N810_EMMC_VSD_GPIO, 0);
err = gpio_request(NN810_EMMC_VIO_GPIO, "MMC slot 2 Vdd"); err = gpio_request(N810_EMMC_VIO_GPIO, "MMC slot 2 Vdd");
if (err) { if (err) {
gpio_free(N8X0_SLOT_SWITCH_GPIO); gpio_free(N8X0_SLOT_SWITCH_GPIO);
gpio_free(N810_EMMC_VSD_GPIO); gpio_free(N810_EMMC_VSD_GPIO);
return err; return;
} }
gpio_direction_output(NN810_EMMC_VIO_GPIO, 0); gpio_direction_output(N810_EMMC_VIO_GPIO, 0);
} }
mmc_data[0] = &mmc1_data; mmc_data[0] = &mmc1_data;