Re: [PATCH 0/3] msm_sdcc: A few more cleanups

[Pavel Machek <pavel@ucw.cz>]

Hi!

> Perhaps these are appropriate as well.
> Uncompiled, I haven't set up an ARM cross compiler yet.
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> 
> Joe Perches (3):
>   msm_sdcc.c: Convert printk(KERN_<level> to pr_<level>(
>   msm_sdcc.c: stylistic cleaning
>   msm_sdcc.c: Move overly indented code to separate function

They look good, but break compilation. With these fixes, it compiles &
boots. Thanks!

Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 010f4f4..6644cda 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -321,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, NSECS_PER_SEC);
+	do_div(clks, NSEC_PER_SEC);
 	timeout = data->timeout_clks + (unsigned int)clks;
 	writel(timeout, base + MMCIDATATIMER);
 
@@ -588,6 +588,8 @@ static void
 msmsdcc_handle_irq_data(struct msmsdcc_host *host, struct mmc_data *data,
 			u32 status)
 {
+	void __iomem	*base = host->base;
+
 	/* Check for data errors */
 	if (status & (MCI_DATACRCFAIL | MCI_DATATIMEOUT | 
 		      MCI_TXUNDERRUN | MCI_RXOVERRUN)) {


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html