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

Make general code cleanups

Browse Source 
This patch is part of Juha Yrjola's and Komal Shah's earlier patch to
make general code cleanups

Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar <at> indt.org.br>
Signed-off-by: Juha Yrjola <juha.yrjola <at> solidboot.com>
Signed-off-by: Komal Shah <komal_shah802003 <at> yahoo.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Juha Yrjola juha.yrjola
2006-11-11 23:42:39 +01:00
committed by Pierre Ossman
parent f4204fdf05
commit c5cb431d27
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/omap.c
View File

@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsigned long arg)
schedule_work(&host->switch_work); schedule_work(&host->switch_work);
} }
/* FIXME: Handle card insertion and removal properly. Maybe use a mask
* for MMC state? */
static void mmc_omap_switch_callback(unsigned long data, u8 mmc_mask)
{
}
static void mmc_omap_switch_handler(void *data) static void mmc_omap_switch_handler(void *data)
{ {
struct mmc_omap_host *host = (struct mmc_omap_host *) data; struct mmc_omap_host *host = (struct mmc_omap_host *) data;
@@ -824,7 +818,6 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
return; return;
} }
block_size = data->blksz; block_size = data->blksz;
OMAP_MMC_WRITE(host, NBLK, data->blocks - 1); OMAP_MMC_WRITE(host, NBLK, data->blocks - 1);
@@ -896,7 +889,6 @@ static void mmc_omap_request(struct mmc_host *mmc, struct mmc_request *req)
static void innovator_fpga_socket_power(int on) static void innovator_fpga_socket_power(int on)
{ {
#if defined(CONFIG_MACH_OMAP_INNOVATOR) && defined(CONFIG_ARCH_OMAP15XX) #if defined(CONFIG_MACH_OMAP_INNOVATOR) && defined(CONFIG_ARCH_OMAP15XX)
if (on) { if (on) {
fpga_write(fpga_read(OMAP1510_FPGA_POWER) | (1 << 3), fpga_write(fpga_read(OMAP1510_FPGA_POWER) | (1 << 3),
OMAP1510_FPGA_POWER); OMAP1510_FPGA_POWER);
@@ -998,7 +990,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
OMAP_MMC_WRITE(host, IE, 0); OMAP_MMC_WRITE(host, IE, 0);
OMAP_MMC_WRITE(host, STAT, 0xffff); OMAP_MMC_WRITE(host, STAT, 0xffff);
OMAP_MMC_WRITE(host, CMD, 1 << 7); OMAP_MMC_WRITE(host, CMD, 1 << 7);
while (0 == (OMAP_MMC_READ(host, STAT) & 1)); while ((OMAP_MMC_READ(host, STAT) & 1) == 0);
OMAP_MMC_WRITE(host, STAT, 1); OMAP_MMC_WRITE(host, STAT, 1);
} }
clk_disable(host->fclk); clk_disable(host->fclk);