diff mbox

[1/2] MMC / TMIO: Fix build issue related to struct scatterlist

Message ID 201107262050.23379.rjw@sisk.pl (mailing list archive)
State Superseded
Headers show

Commit Message

Rafael Wysocki July 26, 2011, 6:50 p.m. UTC 
From: Rafael J. Wysocki <rjw@sisk.pl>

Fix build issue caused by undefined struct scatterlist in
drivers/mmc/host/tmio_mmc.c.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/mmc/host/tmio_mmc.h      |    1 +
 drivers/usb/renesas_usbhs/fifo.c |    1 +
 2 files changed, 2 insertions(+)


--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Guennadi Liakhovetski July 27, 2011, 8:40 p.m. UTC | #1 
(added MMC maintainer to CC:)

On Tue, 26 Jul 2011, Rafael J. Wysocki wrote:

> From: Rafael J. Wysocki <rjw@sisk.pl>
> 
> Fix build issue caused by undefined struct scatterlist in
> drivers/mmc/host/tmio_mmc.c.
> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

A nitpick, if I may: sCatterlist comes before sPinlock in my versions of 
most popular alphabets;-) Please, fix (or maybe Chris can fix it himself), 
after which:

Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Thanks
Guennadi

> ---
>  drivers/mmc/host/tmio_mmc.h      |    1 +
>  drivers/usb/renesas_usbhs/fifo.c |    1 +
>  2 files changed, 2 insertions(+)
> 
> Index: linux-2.6/drivers/mmc/host/tmio_mmc.h
> ===================================================================
> --- linux-2.6.orig/drivers/mmc/host/tmio_mmc.h
> +++ linux-2.6/drivers/mmc/host/tmio_mmc.h
> @@ -21,6 +21,7 @@
>  #include <linux/mutex.h>
>  #include <linux/pagemap.h>
>  #include <linux/spinlock.h>
> +#include <linux/scatterlist.h>
>  
>  /* Definitions for values the CTRL_SDIO_STATUS register can take. */
>  #define TMIO_SDIO_STAT_IOIRQ	0x0001
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chris Ball July 27, 2011, 9:47 p.m. UTC | #2 
Hi Rafael,

On Tue, Jul 26 2011, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> Fix build issue caused by undefined struct scatterlist in
> drivers/mmc/host/tmio_mmc.c.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
>  drivers/mmc/host/tmio_mmc.h      |    1 +
>  drivers/usb/renesas_usbhs/fifo.c |    1 +
>  2 files changed, 2 insertions(+)
>
> Index: linux-2.6/drivers/mmc/host/tmio_mmc.h
> ===================================================================
> --- linux-2.6.orig/drivers/mmc/host/tmio_mmc.h
> +++ linux-2.6/drivers/mmc/host/tmio_mmc.h
> @@ -21,6 +21,7 @@
>  #include <linux/mutex.h>
>  #include <linux/pagemap.h>
>  #include <linux/spinlock.h>
> +#include <linux/scatterlist.h>
>  
>  /* Definitions for values the CTRL_SDIO_STATUS register can take. */
>  #define TMIO_SDIO_STAT_IOIRQ	0x0001

I'm not able to reproduce the build failure here.

drivers/mmc/host/tmio_mmc.c already performs "#include <linux/scatterlist.h>"
itself (and always has done), so I'm confused about why this is necessary.
Do you have a copy of your build log with the error?

Thanks,

- Chris.
Rafael Wysocki July 27, 2011, 9:56 p.m. UTC | #3 
On Wednesday, July 27, 2011, Guennadi Liakhovetski wrote:
> (added MMC maintainer to CC:)
> 
> On Tue, 26 Jul 2011, Rafael J. Wysocki wrote:
> 
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> > 
> > Fix build issue caused by undefined struct scatterlist in
> > drivers/mmc/host/tmio_mmc.c.
> > 
> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> 
> A nitpick, if I may: sCatterlist comes before sPinlock in my versions of 
> most popular alphabets;-) Please, fix (or maybe Chris can fix it himself), 

I'm not sure what you mean exactly (perhaps it's too late).

Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael Wysocki July 27, 2011, 10:06 p.m. UTC | #4 
On Wednesday, July 27, 2011, Chris Ball wrote:
> Hi Rafael,
> 
> On Tue, Jul 26 2011, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> >
> > Fix build issue caused by undefined struct scatterlist in
> > drivers/mmc/host/tmio_mmc.c.
> >
> > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> > ---
> >  drivers/mmc/host/tmio_mmc.h      |    1 +
> >  drivers/usb/renesas_usbhs/fifo.c |    1 +
> >  2 files changed, 2 insertions(+)
> >
> > Index: linux-2.6/drivers/mmc/host/tmio_mmc.h
> > ===================================================================
> > --- linux-2.6.orig/drivers/mmc/host/tmio_mmc.h
> > +++ linux-2.6/drivers/mmc/host/tmio_mmc.h
> > @@ -21,6 +21,7 @@
> >  #include <linux/mutex.h>
> >  #include <linux/pagemap.h>
> >  #include <linux/spinlock.h>
> > +#include <linux/scatterlist.h>
> >  
> >  /* Definitions for values the CTRL_SDIO_STATUS register can take. */
> >  #define TMIO_SDIO_STAT_IOIRQ	0x0001
> 
> I'm not able to reproduce the build failure here.
> 
> drivers/mmc/host/tmio_mmc.c already performs "#include <linux/scatterlist.h>"
> itself (and always has done), so I'm confused about why this is necessary.
> Do you have a copy of your build log with the error?

tmio_mmc.h is included by sh_mobile_sdhi.c too and that one doesn't include
scatterlist.h, which causes a build failure to happen, becuase of the
bounce_sg member of struct tmio_mmc_host.

The patch has been merged already anyway.

Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Guennadi Liakhovetski July 28, 2011, 8:09 p.m. UTC | #5 
On Wed, 27 Jul 2011, Rafael J. Wysocki wrote:

> On Wednesday, July 27, 2011, Guennadi Liakhovetski wrote:
> > (added MMC maintainer to CC:)
> > 
> > On Tue, 26 Jul 2011, Rafael J. Wysocki wrote:
> > 
> > > From: Rafael J. Wysocki <rjw@sisk.pl>
> > > 
> > > Fix build issue caused by undefined struct scatterlist in
> > > drivers/mmc/host/tmio_mmc.c.
> > > 
> > > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> > 
> > A nitpick, if I may: sCatterlist comes before sPinlock in my versions of 
> > most popular alphabets;-) Please, fix (or maybe Chris can fix it himself), 
> 
> I'm not sure what you mean exactly (perhaps it's too late).

I mean, that the headers are atm sorted alphabetically and should remain 
so, therefore you should add the new header one line higher. As for 
compile failure or not: I haven't seen any compile failures myself, but 
the patch is academically correct, because structs, declared in tmio_mmc.h 
embed struct scatterlist, therefore the header has to be included in that 
header too.

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael Wysocki July 28, 2011, 9:07 p.m. UTC | #6 
On Thursday, July 28, 2011, Guennadi Liakhovetski wrote:
> On Wed, 27 Jul 2011, Rafael J. Wysocki wrote:
> 
> > On Wednesday, July 27, 2011, Guennadi Liakhovetski wrote:
> > > (added MMC maintainer to CC:)
> > > 
> > > On Tue, 26 Jul 2011, Rafael J. Wysocki wrote:
> > > 
> > > > From: Rafael J. Wysocki <rjw@sisk.pl>
> > > > 
> > > > Fix build issue caused by undefined struct scatterlist in
> > > > drivers/mmc/host/tmio_mmc.c.
> > > > 
> > > > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> > > 
> > > A nitpick, if I may: sCatterlist comes before sPinlock in my versions of 
> > > most popular alphabets;-) Please, fix (or maybe Chris can fix it himself), 
> > 
> > I'm not sure what you mean exactly (perhaps it's too late).
> 
> I mean, that the headers are atm sorted alphabetically and should remain 
> so, therefore you should add the new header one line higher.

Ah.  Well, as I said the patch had been merged already, so obviously
Linus didn't care. :-)

> As for compile failure or not: I haven't seen any compile failures myself, but 
> the patch is academically correct, because structs, declared in tmio_mmc.h 
> embed struct scatterlist, therefore the header has to be included in that 
> header too.

Exactly.  I've seen a real failure, though.

Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: linux-2.6/drivers/mmc/host/tmio_mmc.h
===================================================================
--- linux-2.6.orig/drivers/mmc/host/tmio_mmc.h
+++ linux-2.6/drivers/mmc/host/tmio_mmc.h
@@ -21,6 +21,7 @@ 
 #include <linux/mutex.h>
 #include <linux/pagemap.h>
 #include <linux/spinlock.h>
+#include <linux/scatterlist.h>
 
 /* Definitions for values the CTRL_SDIO_STATUS register can take. */
 #define TMIO_SDIO_STAT_IOIRQ	0x0001