RE: mmc: dw_mmc: fixed compile error when disable CONFIG_MMC_DW_IDMAC

[Seungwon Jeon <tgih.jun@samsung.com>]

James Hogan <james@albanarts.com> wrote:
> On Thu, Feb 16, 2012 at 11:19:38AM +0900, Jaehoon Chung wrote:
> > When disable CONFIG_MMC_DW_IDMAC, can see the compiler error.
> > Because in dw_mci_post_req(), called the dw_mci_get_dma_dir().
> > But that function is in #ifdef CONFIG_MMC_DW_IDMAC.
> >
> > I think that function is generic function.
> > Not need the CONFIG_MMC_DW_IDMAC.
> >
> > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> 
> I've also tested and confirmed that this fixes a compiler error
> introduced in 3ec7699d3bb1b0ee7f6e8588974a209d47fc64b2 ("mmc: dw_mmc:
> Add support for pre_req and post_req"), however that patch also seems to
> have regressed by disabled DMA when not using the internal DMAC.
> 
> Specifically dw_mci_pre_dma_transfer() returns -ENOSYS when not using
> internal DMAC, which makes dw_mci_submit_data_dma() now return early:
> 
> +       sg_len = dw_mci_pre_dma_transfer(host, data, 0);
> +       if (sg_len < 0)
> +               return sg_len;
> 
> I think that 3ec7699d3bb1b0ee7f6e8588974a209d47fc64b2 should be
> removed/reverted until it is fixed.

Thank you for investigation.
It could be fixed.

Best regards,
Seungwon Jeon.
> 
> Regards
> James
> 
> > ---
> >  drivers/mmc/host/dw_mmc.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> > index f9457e5..692c3ba 100644
> > --- a/drivers/mmc/host/dw_mmc.c
> > +++ b/drivers/mmc/host/dw_mmc.c
> > @@ -295,7 +295,6 @@ static void dw_mci_stop_dma(struct dw_mci *host)
> >  	}
> >  }
> >
> > -#ifdef CONFIG_MMC_DW_IDMAC
> >  static int dw_mci_get_dma_dir(struct mmc_data *data)
> >  {
> >  	if (data->flags & MMC_DATA_WRITE)
> > @@ -304,6 +303,7 @@ static int dw_mci_get_dma_dir(struct mmc_data *data)
> >  		return DMA_FROM_DEVICE;
> >  }
> >
> > +#ifdef CONFIG_MMC_DW_IDMAC
> >  static void dw_mci_dma_cleanup(struct dw_mci *host)
> >  {
> >  	struct mmc_data *data = host->data;
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html