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

Commit 75d14528 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

msm_sdcc.c: stylistic cleaning 



Make it a bit more like typical kernel style.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Brian Swetland <swetland@google.com>
Cc: Pierre Ossman <drzeus-list@drzeus.cx>
Cc: San Mehat <san@android.com>
Cc: Matt Fleming <matt@console-pimps.org>
Cc: Ian Molton <ian@mnementh.co.uk>
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
Cc: Philip Langdale <philipl@overt.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a7ff7c7

drivers/mmc/host/msm_sdcc.c

+24 −21
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <mach/dma.h>

#include <mach/htc_pwrsink.h>





#include "msm_sdcc.h"



#define DRIVER_NAME "msm-sdcc"
@@ -58,8 +57,6 @@ static unsigned int msmsdcc_sdioirq; 
#define PIO_SPINMAX 30

#define CMD_SPINMAX 20







static void

msmsdcc_start_command(struct msmsdcc_host *host, struct mmc_command *cmd,

		      u32 c);
@@ -98,15 +95,16 @@ msmsdcc_stop_data(struct msmsdcc_host *host) 


uint32_t msmsdcc_fifo_addr(struct msmsdcc_host *host)

{

	if (host->pdev_id == 1)

	switch (host->pdev_id) {

	case 1:

		return MSM_SDC1_PHYS + MMCIFIFO;

	else if (host->pdev_id == 2)

	case 2:

		return MSM_SDC2_PHYS + MMCIFIFO;

	else if (host->pdev_id == 3)

	case 3:

		return MSM_SDC3_PHYS + MMCIFIFO;

	else if (host->pdev_id == 4)

	case 4:

		return MSM_SDC4_PHYS + MMCIFIFO;

	else

	}

	BUG();

	return 0;

}
@@ -156,8 +154,8 @@ msmsdcc_dma_complete_func(struct msm_dmov_cmd *cmd, 
		struct scatterlist *sg = host->dma.sg;

		int i;



		for (i = 0; i < host->dma.num_ents; i++, sg++)

			flush_dcache_page(sg_page(sg));

		for (i = 0; i < host->dma.num_ents; i++)

			flush_dcache_page(sg_page(sg++));

	}



	host->dma.sg = NULL;
@@ -222,15 +220,20 @@ static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data) 


	nc = host->dma.nc;



	if (host->pdev_id == 1)

	switch (host->pdev_id) {

	case 1:

		crci = MSMSDCC_CRCI_SDC1;

	else if (host->pdev_id == 2)

		break;

	case 2:

		crci = MSMSDCC_CRCI_SDC2;

	else if (host->pdev_id == 3)

		break;

	case 3:

		crci = MSMSDCC_CRCI_SDC3;

	else if (host->pdev_id == 4)

		break;

	case 4:

		crci = MSMSDCC_CRCI_SDC4;

	else {

		break;

	default:

		host->dma.sg = NULL;

		host->dma.num_ents = 0;

		return -ENOENT;
@@ -318,7 +321,7 @@ msmsdcc_start_data(struct msmsdcc_host *host, struct mmc_data *data) 
	memset(&host->pio, 0, sizeof(host->pio));



	clks = (unsigned long long)data->timeout_ns * host->clk_rate;

	do_div(clks, 1000000000UL);

	do_div(clks, NSEC_PER_SEC);

	timeout = data->timeout_clks + (unsigned int)clks;

	writel(timeout, base + MMCIDATATIMER);
@@ -371,9 +374,9 @@ msmsdcc_start_command(struct msmsdcc_host *host, struct mmc_command *cmd, u32 c) 
		c |= MCI_CPSM_RESPONSE;

	}



	if ((((cmd->opcode == 17) || (cmd->opcode == 18))  ||

	     ((cmd->opcode == 24) || (cmd->opcode == 25))) ||

	      (cmd->opcode == 53))

	if (cmd->opcode == 17 || cmd->opcode == 18 ||

	    cmd->opcode == 24 || cmd->opcode == 25 ||

	    cmd->opcode == 53)

		c |= MCI_CSPM_DATCMD;



	if (cmd == cmd->mrq->stop)