Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5cb431d authored by Juha Yrjola's avatar Juha Yrjola Committed by Pierre Ossman
Browse files

Make general code cleanups 



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: default avatarPierre Ossman <drzeus@drzeus.cx>
parent f4204fdf

drivers/mmc/omap.c

+4 −12
Original line number Diff line number Diff line
@@ -581,12 +581,6 @@ static void mmc_omap_switch_timer(unsigned long arg) 
	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)

{

	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;

	}





	block_size = data->blksz;



	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)

{

#if defined(CONFIG_MACH_OMAP_INNOVATOR) && defined(CONFIG_ARCH_OMAP15XX)



	if (on) {

		fpga_write(fpga_read(OMAP1510_FPGA_POWER) | (1 << 3),

		     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, STAT, 0xffff);

		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);

	}

	clk_disable(host->fclk);