[PATCH 01/18] MMC: OMAP: Remove some opcodes from host driver

[PATCH 01/18] MMC: OMAP: Remove some opcodes from host driver

[Carlos Aguiar]

From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>

This patch removes some opcodes from host driver so there's no need on putting
'#include <linux/mmc/mmc.h>', that should not be needed in host drivers.

Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
---
 drivers/mmc/host/omap.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index c9dfeb1..eb7175a 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -495,15 +495,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 		if (status & OMAP_MMC_STAT_CMD_TOUT) {
 			/* Timeouts are routine with some commands */
 			if (host->cmd) {
-				if (host->cmd->opcode != MMC_ALL_SEND_CID &&
-						host->cmd->opcode !=
-						MMC_SEND_OP_COND &&
-						host->cmd->opcode !=
-						MMC_APP_CMD &&
-						!mmc_omap_cover_is_open(host))
+				if (!mmc_omap_cover_is_open(host))
 					dev_err(mmc_dev(host->mmc),
-						"command timeout, CMD %d\n",
-						host->cmd->opcode);
+					"command timeout, CMD %d\n",
+					host->cmd->opcode);
 				host->cmd->error = -ETIMEDOUT;
 				end_command = 1;
 			}
-- 1.5.3.GIT

Re: [PATCH 01/18] MMC: OMAP: Remove some opcodes from host driver

[Pierre Ossman]

On Fri, 14 Mar 2008 15:36:01 -0400
Carlos Aguiar <carlos.aguiar@indt.org.br> wrote:

> From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
> 
> This patch removes some opcodes from host driver so there's no need on putting
> '#include <linux/mmc/mmc.h>', that should not be needed in host drivers.
> 
> Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
> ---

Looks good.

-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

Re: [PATCH 01/18] MMC: OMAP: Remove some opcodes from host driver

[Felipe Balbi]

On Fri, Mar 14, 2008 at 9:36 PM, Carlos Aguiar
<carlos.aguiar@indt.org.br> wrote:
> From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
>
>  This patch removes some opcodes from host driver so there's no need on putting
>  '#include <linux/mmc/mmc.h>', that should not be needed in host drivers.
>

You should update this patch and remove the '#include
<linux/mmc/mmc.h>' from omap.c

>  Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
>  ---
>   drivers/mmc/host/omap.c |   11 +++--------
>   1 files changed, 3 insertions(+), 8 deletions(-)
>
>  diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
>  index c9dfeb1..eb7175a 100644
>  --- a/drivers/mmc/host/omap.c
>  +++ b/drivers/mmc/host/omap.c
>  @@ -495,15 +495,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
>                 if (status & OMAP_MMC_STAT_CMD_TOUT) {
>                         /* Timeouts are routine with some commands */
>                         if (host->cmd) {
>  -                               if (host->cmd->opcode != MMC_ALL_SEND_CID &&
>  -                                               host->cmd->opcode !=
>  -                                               MMC_SEND_OP_COND &&
>  -                                               host->cmd->opcode !=
>  -                                               MMC_APP_CMD &&
>  -                                               !mmc_omap_cover_is_open(host))
>  +                               if (!mmc_omap_cover_is_open(host))
>                                         dev_err(mmc_dev(host->mmc),
>  -                                               "command timeout, CMD %d\n",
>  -                                               host->cmd->opcode);
>  +                                       "command timeout, CMD %d\n",
>  +                                       host->cmd->opcode);
>                                 host->cmd->error = -ETIMEDOUT;
>                                 end_command = 1;
>                         }
>  -- 1.5.3.GIT
>
>  --
>  To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>  the body of a message to majordomo@vger.kernel.org
>  More majordomo info at  http://vger.kernel.org/majordomo-info.html
>  Please read the FAQ at  http://www.tux.org/lkml/
>



-- 
Best Regards,

Felipe Balbi
felipebalbi@users.sourceforge.net

[PATCH 00/18] MMC: OMAP: Sync MMC OMAP driver with mainline tree

[Carlos Aguiar]

Hi Pierre, Tony and folks,

The new version of the patch series that follows is a synchronization
of MMC OMAP driver from Linux-OMAP tree into mainline tree.

Improvements and corrections are based on comments from Pierre Ossman and 
Roel Kluin, from LKML.

Just to remind you, basically it brings MMC multislot support for OMAP boards 
with one slot (like H2 1611, H3 1710) or two slots (like H4 2420 and N800).
Others boards supported by such feature are: N770, Siemens SX1 and Apollon.

BR,

Carlos.

-- 
Carlos Eduardo Aguiar
Nokia Institute of Technology - INdT
Open Source Mobile Research Center - OSMRC - Manaus
Core Team
Phone: +55 92 2126-1079
Mobile: +55 92 8127-1797
E-mail: carlos.aguiar@indt.org.br

Re: [PATCH 00/18] MMC: OMAP: Sync MMC OMAP driver with mainline tree

[Pierre Ossman]

On Fri, 14 Mar 2008 15:35:56 -0400
Carlos Aguiar <carlos.aguiar@indt.org.br> wrote:

Except for the issue with the device attributes, the patch set looks fine. Send me a fix for that patch (and affected subsequent) and I'll queue it up.

-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  PulseAudio, core developer          http://pulseaudio.org
  rdesktop, core developer          http://www.rdesktop.org

[PATCH 01/18] MMC: OMAP: Remove some opcodes from host driver

[Carlos Aguiar]

From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>

This patch removes some opcodes from host driver so there's no need on putting
'#include <linux/mmc/mmc.h>', that should not be needed in host drivers.

Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
---
 drivers/mmc/host/omap.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index c9dfeb1..eb7175a 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -495,15 +495,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 		if (status & OMAP_MMC_STAT_CMD_TOUT) {
 			/* Timeouts are routine with some commands */
 			if (host->cmd) {
-				if (host->cmd->opcode != MMC_ALL_SEND_CID &&
-						host->cmd->opcode !=
-						MMC_SEND_OP_COND &&
-						host->cmd->opcode !=
-						MMC_APP_CMD &&
-						!mmc_omap_cover_is_open(host))
+				if (!mmc_omap_cover_is_open(host))
 					dev_err(mmc_dev(host->mmc),
-						"command timeout, CMD %d\n",
-						host->cmd->opcode);
+					"command timeout, CMD %d\n",
+					host->cmd->opcode);
 				host->cmd->error = -ETIMEDOUT;
 				end_command = 1;
 			}
-- 1.5.3.GIT