public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drivers: mmc: bfin_sdh: fix build error
@ 2012-07-30  7:03 Bob Liu
  2012-08-06  9:27 ` Bob Liu
  0 siblings, 1 reply; 4+ messages in thread
From: Bob Liu @ 2012-07-30  7:03 UTC (permalink / raw)
  To: linux-mmc
  Cc: adrian.hunter, ludovic.desroches, rmk+kernel, g.liakhovetski, cjb,
	uclinux-dist-devel, Sonic Zhang, Bob Liu

From: Sonic Zhang <sonic.zhang@analog.com>

Descriptor array structure has been moved into blackfin dma.h head file.
This patch fix below error:

drivers/mmc/host/bfin_sdh.c:52:8: error: redefinition of 'struct
dma_desc_array'
make[4]: *** [drivers/mmc/host/bfin_sdh.o] Error 1

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
---
 drivers/mmc/host/bfin_sdh.c |   13 -------------
 1 file changed, 13 deletions(-)

diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index 0366617..a17dd73 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -49,13 +49,6 @@
 #define bfin_write_SDH_CFG		bfin_write_RSI_CFG
 #endif
 
-struct dma_desc_array {
-	unsigned long	start_addr;
-	unsigned short	cfg;
-	unsigned short	x_count;
-	short		x_modify;
-} __packed;
-
 struct sdh_host {
 	struct mmc_host		*mmc;
 	spinlock_t		lock;
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] drivers: mmc: bfin_sdh: fix build error
  2012-07-30  7:03 [PATCH] drivers: mmc: bfin_sdh: fix build error Bob Liu
@ 2012-08-06  9:27 ` Bob Liu
  2012-08-06 15:34   ` Chris Ball
  0 siblings, 1 reply; 4+ messages in thread
From: Bob Liu @ 2012-08-06  9:27 UTC (permalink / raw)
  To: cjb
  Cc: adrian.hunter, ludovic.desroches, rmk+kernel, g.liakhovetski,
	uclinux-dist-devel, Sonic Zhang, Bob Liu, linux-mmc

Hi Chris,

Would you please take a look at this patch?
Since without this patch, regression test for blackfin will fail:
http://kisskb.ellerman.id.au/kisskb/matrix/

Thank you!

On Mon, Jul 30, 2012 at 3:03 PM, Bob Liu <lliubbo@gmail.com> wrote:
> From: Sonic Zhang <sonic.zhang@analog.com>
>
> Descriptor array structure has been moved into blackfin dma.h head file.
> This patch fix below error:
>
> drivers/mmc/host/bfin_sdh.c:52:8: error: redefinition of 'struct
> dma_desc_array'
> make[4]: *** [drivers/mmc/host/bfin_sdh.o] Error 1
>
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> Signed-off-by: Bob Liu <lliubbo@gmail.com>
> ---
>  drivers/mmc/host/bfin_sdh.c |   13 -------------
>  1 file changed, 13 deletions(-)
>
> diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
> index 0366617..a17dd73 100644
> --- a/drivers/mmc/host/bfin_sdh.c
> +++ b/drivers/mmc/host/bfin_sdh.c
> @@ -49,13 +49,6 @@
>  #define bfin_write_SDH_CFG             bfin_write_RSI_CFG
>  #endif
>
> -struct dma_desc_array {
> -       unsigned long   start_addr;
> -       unsigned short  cfg;
> -       unsigned short  x_count;
> -       short           x_modify;
> -} __packed;
> -
>  struct sdh_host {
>         struct mmc_host         *mmc;
>         spinlock_t              lock;
> --
> 1.7.9.5
>

-- 
Regards,
--Bob

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] drivers: mmc: bfin_sdh: fix build error
  2012-08-06  9:27 ` Bob Liu
@ 2012-08-06 15:34   ` Chris Ball
  2012-08-07  2:10     ` Bob Liu
  0 siblings, 1 reply; 4+ messages in thread
From: Chris Ball @ 2012-08-06 15:34 UTC (permalink / raw)
  To: Bob Liu
  Cc: adrian.hunter, ludovic.desroches, rmk+kernel, g.liakhovetski,
	uclinux-dist-devel, Sonic Zhang, linux-mmc

Hi Bob,

On Mon, Aug 06 2012, Bob Liu wrote:
> Would you please take a look at this patch?
> Since without this patch, regression test for blackfin will fail:
> http://kisskb.ellerman.id.au/kisskb/matrix/

Thanks, pushed to mmc-next for 3.6 now.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] drivers: mmc: bfin_sdh: fix build error
  2012-08-06 15:34   ` Chris Ball
@ 2012-08-07  2:10     ` Bob Liu
  0 siblings, 0 replies; 4+ messages in thread
From: Bob Liu @ 2012-08-07  2:10 UTC (permalink / raw)
  To: Chris Ball
  Cc: adrian.hunter, ludovic.desroches, rmk+kernel, g.liakhovetski,
	uclinux-dist-devel, Sonic Zhang, linux-mmc

On Mon, Aug 6, 2012 at 11:34 PM, Chris Ball <cjb@laptop.org> wrote:
> Hi Bob,
>
> On Mon, Aug 06 2012, Bob Liu wrote:
>> Would you please take a look at this patch?
>> Since without this patch, regression test for blackfin will fail:
>> http://kisskb.ellerman.id.au/kisskb/matrix/
>
> Thanks, pushed to mmc-next for 3.6 now.
>

Thank you.

> - Chris.
> --
> Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> One Laptop Per Child

-- 
Regards,
--Bob

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-08-07  2:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-30  7:03 [PATCH] drivers: mmc: bfin_sdh: fix build error Bob Liu
2012-08-06  9:27 ` Bob Liu
2012-08-06 15:34   ` Chris Ball
2012-08-07  2:10     ` Bob Liu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox