Re: [MFD] Patchset *UPDATED*

[Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>]

On Mon, Jul 21, 2008 at 12:15:03PM +0100, ian wrote:
> 
> Hi folks,
> 
> Latest version:
> 
> http://git.mnementh.co.uk/cgi-bin/gitweb.cgi?p=linux-2.6-im.git;a=shortlog;h=refs/heads/mfd_push_try_7
> 

Checked mfd_push_try_9. tmio_mmc didn't even compile. Patch below

-- 
With best wishes
Dmitry

>From 9c1f1da3a35e6f067c07a713ac95f1a1ce971cc1 Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>
Date: Fri, 25 Jul 2008 13:12:50 +0400
Subject: [PATCH] Fix tmio_mmc compilation

Signed-off-by: Dmitry Baryshkov <dbaryshkov@xxxxxxxxx>
---
 drivers/mmc/host/tmio_mmc.c |    4 ++--
 drivers/mmc/host/tmio_mmc.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index cd8c5e4..88a706f 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -133,7 +133,7 @@ tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command *cmd)
 	struct mmc_data *data = host->data;
 	int c = cmd->opcode;
 
-	if (cmd->opcode == 12 && !cmd.arg) {
+	if (cmd->opcode == 12 && !cmd->arg) {
 		iowrite16(0x001, ctl + CTL_STOP_INTERNAL_ACTION);
 		return 0;
 	}
@@ -333,7 +333,7 @@ static irqreturn_t tmio_mmc_irq(int irq, void *devid)
 	if (!ireg) {
 		disable_mmc_irqs(ctl, status & ~irq_mask);
 #ifdef CONFIG_MMC_DEBUG
-		WARN("tmio_mmc: Spurious irq, disabling! "
+		pr_warning("tmio_mmc: Spurious irq, disabling! "
 			"0x%08x 0x%08x 0x%08x\n", status, irq_mask, ireg);
 		debug_status(status);
 #endif
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 4bc9cc1..afa15a5 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -160,7 +160,7 @@ static inline void tmio_mmc_kunmap_atomic(struct tmio_mmc_host *host,
 #define STATUS_TO_TEXT(a) \
 	do { \
 		if (status & TMIO_STAT_##a) \
-			printf(#a); \
+			printk(" " #a); \
 	} while (0)
 
 void debug_status(u32 status)
-- 
1.5.6.2


-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php