| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <a32cf64a3f82bf3e40b7a306a7c4a4a1d458088c.1246371534.git.joe@perches.com>
Date: Tue, 30 Jun 2009 08:31:38 -0700
From: Joe Perches <joe@...ches.com>
To: Pavel Machek <pavel@....cz>
Cc: linux-kernel@...r.kernel.org, pierre@...man.eu,
swetland@...gle.com, Andrew Morton <akpm@...ux-foundation.org>,
San Mehat <san@...gle.com>
Subject: [PATCH V2 2/3] msm_sdcc.c: stylistic cleaning
Make a bit more like typical kernel style
Signed-off-by: Joe Perches <joe@...ches.com>
---
drivers/mmc/host/msm_sdcc.c | 45 ++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 68bce64..874de6a 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -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,16 +95,17 @@ 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();
+ }
+ 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;
@@ -244,7 +247,7 @@ static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data)
host->curr.user_pages = 0;
n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg,
- host->dma.num_ents, host->dma.dir);
+ host->dma.num_ents, host->dma.dir);
if (n != host->dma.num_ents) {
pr_err("%s: Unable to map in all sg elements\n",
@@ -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)
--
1.6.3.1.10.g659a0.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists