From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758525Ab1F3HXV (ORCPT ); Thu, 30 Jun 2011 03:23:21 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:64503 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751320Ab1F3HXN (ORCPT ); Thu, 30 Jun 2011 03:23:13 -0400 Date: Thu, 30 Jun 2011 09:23:10 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Axel Lin cc: linux-kernel@vger.kernel.org, Ian Molton , Chris Ball , linux-mmc@vger.kernel.org Subject: Re: [PATCH] mmc: tmio: fix build error if CONFIG_MMC_SDHI is not configured In-Reply-To: <1309409956.10500.3.camel@phoenix> Message-ID: References: <1309409956.10500.3.camel@phoenix> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Provags-ID: V02:K0:grb1TcgAM4mWrb/1cjLEXnKQeYCCUmQ64XSXJdMhfvL njR4mWTq4zN3j2Y3SMAR+tpzwCY/70IE8u8j2CjcyevGIqKcGL sdVHquPkbwALFDqZOTt47MNO6gXLaFq1kBle+ev2tkzpNbr8km /lJlwOV9jJIXL4iK00PL94g5oBLQ/UuRP0opR43FgYdvVUcIML S2M4Pwri1XQGmzsP5ulKlXGnVi4UOvGvCbVKhgVB7A= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Axel On Thu, 30 Jun 2011, Axel Lin wrote: > Fix below build error: > > CC drivers/mmc/host/tmio_mmc_dma.o > drivers/mmc/host/tmio_mmc_dma.c:192: error: redefinition of 'tmio_mmc_start_dma' > drivers/mmc/host/tmio_mmc.h:111: error: previous definition of 'tmio_mmc_start_dma' was here > drivers/mmc/host/tmio_mmc_dma.c:257: error: redefinition of 'tmio_mmc_request_dma' > drivers/mmc/host/tmio_mmc.h:116: error: previous definition of 'tmio_mmc_request_dma' was here > drivers/mmc/host/tmio_mmc_dma.c:305: error: redefinition of 'tmio_mmc_release_dma' > drivers/mmc/host/tmio_mmc.h:122: error: previous definition of 'tmio_mmc_release_dma' was here > make[3]: *** [drivers/mmc/host/tmio_mmc_dma.o] Error 1 > make[2]: *** [drivers/mmc/host] Error 2 > make[1]: *** [drivers/mmc] Error 2 > make: *** [drivers] Error 2 > > Signed-off-by: Axel Lin This is a known bug and a correct fix for it is this: http://www.mail-archive.com/linux-mmc@vger.kernel.org/msg07999.html No idea, why it still hasn't been applied, Chris? Thanks Guennadi > --- > drivers/mmc/host/tmio_mmc_dma.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c > index a40fdba..4dc563a 100644 > --- a/drivers/mmc/host/tmio_mmc_dma.c > +++ b/drivers/mmc/host/tmio_mmc_dma.c > @@ -189,6 +189,7 @@ pio: > desc, cookie); > } > > +#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE) > void tmio_mmc_start_dma(struct tmio_mmc_host *host, > struct mmc_data *data) > { > @@ -200,6 +201,7 @@ void tmio_mmc_start_dma(struct tmio_mmc_host *host, > tmio_mmc_start_dma_tx(host); > } > } > +#endif > > static void tmio_mmc_issue_tasklet_fn(unsigned long priv) > { > @@ -254,6 +256,7 @@ static bool tmio_mmc_filter(struct dma_chan *chan, void *arg) > return true; > } > > +#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE) > void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata) > { > /* We can only either use DMA for both Tx and Rx or not use it at all */ > @@ -319,3 +322,4 @@ void tmio_mmc_release_dma(struct tmio_mmc_host *host) > host->bounce_buf = NULL; > } > } > +#endif > -- > 1.7.4.1 > > > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/