diff mbox

SFI: fix compilation warnings

Message ID 1386264397-27319-1-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Andy Shevchenko Dec. 5, 2013, 5:26 p.m. UTC
When build kernel with make W=1 we get the following compiler error.

In file included from drivers/sfi/sfi_acpi.c:66:0:
include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
  if (!acpi_table_parse(signature, handler))
  ^
  cc1: some warnings being treated as errors

The patch changes acpi/acpi.h inclusion to linux/acpi.h.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/sfi/sfi_acpi.c   | 2 +-
 include/linux/sfi_acpi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Rafael J. Wysocki Dec. 5, 2013, 10:36 p.m. UTC | #1
On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote:
> When build kernel with make W=1 we get the following compiler error.
> 
> In file included from drivers/sfi/sfi_acpi.c:66:0:
> include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
> include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
>   if (!acpi_table_parse(signature, handler))
>   ^
>   cc1: some warnings being treated as errors
> 
> The patch changes acpi/acpi.h inclusion to linux/acpi.h.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

OK

Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing
out entirely for the next cycle.

Thanks!

> ---
>  drivers/sfi/sfi_acpi.c   | 2 +-
>  include/linux/sfi_acpi.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c
> index 0c9f419..d4dfcbe 100644
> --- a/drivers/sfi/sfi_acpi.c
> +++ b/drivers/sfi/sfi_acpi.c
> @@ -60,7 +60,7 @@
>  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
>  
>  #include <linux/kernel.h>
> -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
> +#include <linux/acpi.h>
>  
>  #include <linux/sfi.h>
>  #include <linux/sfi_acpi.h>
> diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
> index 2cfcb79..c9cab82 100644
> --- a/include/linux/sfi_acpi.h
> +++ b/include/linux/sfi_acpi.h
> @@ -60,7 +60,7 @@
>  #define _LINUX_SFI_ACPI_H
>  
>  #ifdef CONFIG_SFI
> -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
> +#include <linux/acpi.h>
>  
>  extern int sfi_acpi_table_parse(char *signature, char *oem_id,
>  				char *oem_table_id,
>
Rafael J. Wysocki Dec. 5, 2013, 10:40 p.m. UTC | #2
On Thursday, December 05, 2013 11:36:37 PM Rafael J. Wysocki wrote:
> On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote:
> > When build kernel with make W=1 we get the following compiler error.
> > 
> > In file included from drivers/sfi/sfi_acpi.c:66:0:
> > include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
> > include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
> >   if (!acpi_table_parse(signature, handler))
> >   ^
> >   cc1: some warnings being treated as errors
> > 
> > The patch changes acpi/acpi.h inclusion to linux/acpi.h.
> > 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> OK
> 
> Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing
> out entirely for the next cycle.

Or rather I'll keep it in bleeding-edge and wait for follow-up patches to
fix build problems like this one (then we can merge it into 3.14 hopefully).

Thanks!

> > ---
> >  drivers/sfi/sfi_acpi.c   | 2 +-
> >  include/linux/sfi_acpi.h | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c
> > index 0c9f419..d4dfcbe 100644
> > --- a/drivers/sfi/sfi_acpi.c
> > +++ b/drivers/sfi/sfi_acpi.c
> > @@ -60,7 +60,7 @@
> >  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
> >  
> >  #include <linux/kernel.h>
> > -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
> > +#include <linux/acpi.h>
> >  
> >  #include <linux/sfi.h>
> >  #include <linux/sfi_acpi.h>
> > diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
> > index 2cfcb79..c9cab82 100644
> > --- a/include/linux/sfi_acpi.h
> > +++ b/include/linux/sfi_acpi.h
> > @@ -60,7 +60,7 @@
> >  #define _LINUX_SFI_ACPI_H
> >  
> >  #ifdef CONFIG_SFI
> > -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
> > +#include <linux/acpi.h>
> >  
> >  extern int sfi_acpi_table_parse(char *signature, char *oem_id,
> >  				char *oem_table_id,
> > 
>
Lv Zheng Dec. 6, 2013, 1:05 a.m. UTC | #3
Hi,

> From: Andy Shevchenko [mailto:andriy.shevchenko@linux.intel.com]

> Sent: Friday, December 06, 2013 1:27 AM

> 

> When build kernel with make W=1 we get the following compiler error.

> 

> In file included from drivers/sfi/sfi_acpi.c:66:0:

> include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:

> include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]

>   if (!acpi_table_parse(signature, handler))

>   ^

>   cc1: some warnings being treated as errors

> 

> The patch changes acpi/acpi.h inclusion to linux/acpi.h.


Have you tested this patch with:
CONFIG_ACPI=n
CONFIG_SFI=y

Will this trigger build errors like:
> > arch/x86/pci/mmconfig-shared.c:551:13: warning: 'struct acpi_mcfg_allocation' declared inside parameter list [enabled by default]

> > arch/x86/pci/mmconfig-shared.c:551:13: warning: its scope is only this definition or declaration, which is probably not what you want

> [enabled by default]

> > arch/x86/pci/mmconfig-shared.c:551:13: warning: 'struct acpi_table_mcfg' declared inside parameter list [enabled by default]

> > arch/x86/pci/mmconfig-shared.c: In function 'acpi_mcfg_check_entry':

> > arch/x86/pci/mmconfig-shared.c:555:9: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:558:19: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:561:10: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:567:2: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c: In function 'pci_parse_mcfg':

> > arch/x86/pci/mmconfig-shared.c:588:12: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:588:30: error: invalid application of 'sizeof' to incomplete type 'struct acpi_table_mcfg'

> > arch/x86/pci/mmconfig-shared.c:589:21: error: invalid application of 'sizeof' to incomplete type 'struct acpi_mcfg_allocation'

> > arch/x86/pci/mmconfig-shared.c:591:15: error: invalid application of 'sizeof' to incomplete type 'struct acpi_mcfg_allocation'

> > arch/x86/pci/mmconfig-shared.c:598:22: error: invalid use of undefined type 'struct acpi_table_mcfg'

> > arch/x86/pci/mmconfig-shared.c:598:51: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:600:3: error: invalid use of undefined type 'struct acpi_mcfg_allocation'

> > arch/x86/pci/mmconfig-shared.c:600:19: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:601:3: warning: passing argument 1 of 'acpi_mcfg_check_entry' from incompatible pointer type

> [enabled by default]

> > arch/x86/pci/mmconfig-shared.c:550:19: note: expected 'struct acpi_table_mcfg *' but argument is of type 'struct acpi_table_mcfg

> *'

> > arch/x86/pci/mmconfig-shared.c:601:3: warning: passing argument 2 of 'acpi_mcfg_check_entry' from incompatible pointer type

> [enabled by default]

> > arch/x86/pci/mmconfig-shared.c:550:19: note: expected 'struct acpi_mcfg_allocation *' but argument is of type 'struct

> acpi_mcfg_allocation *'

> > arch/x86/pci/mmconfig-shared.c:606:27: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:606:45: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:607:11: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c:607:32: error: dereferencing pointer to incomplete type

> > arch/x86/pci/mmconfig-shared.c: In function 'pci_mmcfg_early_init':

> > arch/x86/pci/mmconfig-shared.c:649:25: error: 'ACPI_SIG_MCFG' undeclared (first use in this function)

> > arch/x86/pci/mmconfig-shared.c:649:25: note: each undeclared identifier is reported only once for each function it appears in

> > arch/x86/pci/mmconfig-shared.c: In function 'pci_mmcfg_late_init':

> > arch/x86/pci/mmconfig-shared.c:665:24: error: 'ACPI_SIG_MCFG' undeclared (first use in this function)


Please check.

Thanks
-Lv


> 

> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> ---

>  drivers/sfi/sfi_acpi.c   | 2 +-

>  include/linux/sfi_acpi.h | 2 +-

>  2 files changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c

> index 0c9f419..d4dfcbe 100644

> --- a/drivers/sfi/sfi_acpi.c

> +++ b/drivers/sfi/sfi_acpi.c

> @@ -60,7 +60,7 @@

>  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

> 

>  #include <linux/kernel.h>

> -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */

> +#include <linux/acpi.h>

> 

>  #include <linux/sfi.h>

>  #include <linux/sfi_acpi.h>

> diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h

> index 2cfcb79..c9cab82 100644

> --- a/include/linux/sfi_acpi.h

> +++ b/include/linux/sfi_acpi.h

> @@ -60,7 +60,7 @@

>  #define _LINUX_SFI_ACPI_H

> 

>  #ifdef CONFIG_SFI

> -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */

> +#include <linux/acpi.h>

> 

>  extern int sfi_acpi_table_parse(char *signature, char *oem_id,

>  				char *oem_table_id,

> --

> 1.8.4.4
Lv Zheng Dec. 6, 2013, 1:08 a.m. UTC | #4
> From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]

> Sent: Friday, December 06, 2013 6:37 AM

> 

> On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote:

> > When build kernel with make W=1 we get the following compiler error.

> >

> > In file included from drivers/sfi/sfi_acpi.c:66:0:

> > include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:

> > include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]

> >   if (!acpi_table_parse(signature, handler))

> >   ^

> >   cc1: some warnings being treated as errors

> >

> > The patch changes acpi/acpi.h inclusion to linux/acpi.h.

> >

> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> 

> OK

> 

> Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing

> out entirely for the next cycle.


No, I think Andy's patch is wrong.
This warning is existing before merging my fixes.

Either we fix this warning or leave it as is.

To fix it, you need to add 1 line in sfi_acpi.h rather than change the line.
Let me post a fix for this.

Thanks
-Lv

> 

> Thanks!

> 

> > ---

> >  drivers/sfi/sfi_acpi.c   | 2 +-

> >  include/linux/sfi_acpi.h | 2 +-

> >  2 files changed, 2 insertions(+), 2 deletions(-)

> >

> > diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c

> > index 0c9f419..d4dfcbe 100644

> > --- a/drivers/sfi/sfi_acpi.c

> > +++ b/drivers/sfi/sfi_acpi.c

> > @@ -60,7 +60,7 @@

> >  #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

> >

> >  #include <linux/kernel.h>

> > -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */

> > +#include <linux/acpi.h>

> >

> >  #include <linux/sfi.h>

> >  #include <linux/sfi_acpi.h>

> > diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h

> > index 2cfcb79..c9cab82 100644

> > --- a/include/linux/sfi_acpi.h

> > +++ b/include/linux/sfi_acpi.h

> > @@ -60,7 +60,7 @@

> >  #define _LINUX_SFI_ACPI_H

> >

> >  #ifdef CONFIG_SFI

> > -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */

> > +#include <linux/acpi.h>

> >

> >  extern int sfi_acpi_table_parse(char *signature, char *oem_id,

> >  				char *oem_table_id,

> >

> --

> I speak only for myself.

> Rafael J. Wysocki, Intel Open Source Technology Center.
Rafael J. Wysocki Dec. 6, 2013, 1:25 a.m. UTC | #5
On Friday, December 06, 2013 01:08:45 AM Zheng, Lv wrote:
> > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> > Sent: Friday, December 06, 2013 6:37 AM
> > 
> > On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote:
> > > When build kernel with make W=1 we get the following compiler error.
> > >
> > > In file included from drivers/sfi/sfi_acpi.c:66:0:
> > > include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
> > > include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
> > >   if (!acpi_table_parse(signature, handler))
> > >   ^
> > >   cc1: some warnings being treated as errors
> > >
> > > The patch changes acpi/acpi.h inclusion to linux/acpi.h.
> > >
> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > 
> > OK
> > 
> > Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing
> > out entirely for the next cycle.
> 
> No, I think Andy's patch is wrong.

His patch may be wrong, but the warning in his changelog surely is real. :-)

> This warning is existing before merging my fixes.
> 
> Either we fix this warning or leave it as is.
> 
> To fix it, you need to add 1 line in sfi_acpi.h rather than change the line.
> Let me post a fix for this.

Please do.  And I'm putting all ACPI header cleanups on hold until all warnings
of this kind have been fixed by them.  Otherwise doing those cleanups makes a
little sense in my opinion.

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lv Zheng Dec. 6, 2013, 1:26 a.m. UTC | #6
PiBGcm9tOiBSYWZhZWwgSi4gV3lzb2NraSBbbWFpbHRvOnJqd0Byand5c29ja2kubmV0XQ0KPiBT
ZW50OiBGcmlkYXksIERlY2VtYmVyIDA2LCAyMDEzIDk6MjYgQU0NCj4gDQo+IE9uIEZyaWRheSwg
RGVjZW1iZXIgMDYsIDIwMTMgMDE6MDg6NDUgQU0gWmhlbmcsIEx2IHdyb3RlOg0KPiA+ID4gRnJv
bTogUmFmYWVsIEouIFd5c29ja2kgW21haWx0bzpyandAcmp3eXNvY2tpLm5ldF0NCj4gPiA+IFNl
bnQ6IEZyaWRheSwgRGVjZW1iZXIgMDYsIDIwMTMgNjozNyBBTQ0KPiA+ID4NCj4gPiA+IE9uIFRo
dXJzZGF5LCBEZWNlbWJlciAwNSwgMjAxMyAwNzoyNjozNyBQTSBBbmR5IFNoZXZjaGVua28gd3Jv
dGU6DQo+ID4gPiA+IFdoZW4gYnVpbGQga2VybmVsIHdpdGggbWFrZSBXPTEgd2UgZ2V0IHRoZSBm
b2xsb3dpbmcgY29tcGlsZXIgZXJyb3IuDQo+ID4gPiA+DQo+ID4gPiA+IEluIGZpbGUgaW5jbHVk
ZWQgZnJvbSBkcml2ZXJzL3NmaS9zZmlfYWNwaS5jOjY2OjA6DQo+ID4gPiA+IGluY2x1ZGUvbGlu
dXgvc2ZpX2FjcGkuaDogSW4gZnVuY3Rpb24g4oCYYWNwaV9zZmlfdGFibGVfcGFyc2XigJk6DQo+
ID4gPiA+IGluY2x1ZGUvbGludXgvc2ZpX2FjcGkuaDo3MjoyOiBlcnJvcjogaW1wbGljaXQgZGVj
bGFyYXRpb24gb2YgZnVuY3Rpb24g4oCYYWNwaV90YWJsZV9wYXJzZeKAmSBbLVdlcnJvcj1pbXBs
aWNpdC1mdW5jdGlvbi1kZWNsYXJhdGlvbl0NCj4gPiA+ID4gICBpZiAoIWFjcGlfdGFibGVfcGFy
c2Uoc2lnbmF0dXJlLCBoYW5kbGVyKSkNCj4gPiA+ID4gICBeDQo+ID4gPiA+ICAgY2MxOiBzb21l
IHdhcm5pbmdzIGJlaW5nIHRyZWF0ZWQgYXMgZXJyb3JzDQo+ID4gPiA+DQo+ID4gPiA+IFRoZSBw
YXRjaCBjaGFuZ2VzIGFjcGkvYWNwaS5oIGluY2x1c2lvbiB0byBsaW51eC9hY3BpLmguDQo+ID4g
PiA+DQo+ID4gPiA+IFNpZ25lZC1vZmYtYnk6IEFuZHkgU2hldmNoZW5rbyA8YW5kcml5LnNoZXZj
aGVua29AbGludXguaW50ZWwuY29tPg0KPiA+ID4NCj4gPiA+IE9LDQo+ID4gPg0KPiA+ID4gTHYs
IEknbSBkcm9wcGluZyB5b3VyIHBhdGNoIGNsZWFuaW5nIHVwIHRoZSBpbmNsdXNpb25zLCBwbGVh
c2Ugc29ydCB0aGF0IHRoaW5nDQo+ID4gPiBvdXQgZW50aXJlbHkgZm9yIHRoZSBuZXh0IGN5Y2xl
Lg0KPiA+DQo+ID4gTm8sIEkgdGhpbmsgQW5keSdzIHBhdGNoIGlzIHdyb25nLg0KPiANCj4gSGlz
IHBhdGNoIG1heSBiZSB3cm9uZywgYnV0IHRoZSB3YXJuaW5nIGluIGhpcyBjaGFuZ2Vsb2cgc3Vy
ZWx5IGlzIHJlYWwuIDotKQ0KPiANCj4gPiBUaGlzIHdhcm5pbmcgaXMgZXhpc3RpbmcgYmVmb3Jl
IG1lcmdpbmcgbXkgZml4ZXMuDQo+ID4NCj4gPiBFaXRoZXIgd2UgZml4IHRoaXMgd2FybmluZyBv
ciBsZWF2ZSBpdCBhcyBpcy4NCj4gPg0KPiA+IFRvIGZpeCBpdCwgeW91IG5lZWQgdG8gYWRkIDEg
bGluZSBpbiBzZmlfYWNwaS5oIHJhdGhlciB0aGFuIGNoYW5nZSB0aGUgbGluZS4NCj4gPiBMZXQg
bWUgcG9zdCBhIGZpeCBmb3IgdGhpcy4NCj4gDQo+IFBsZWFzZSBkby4gIEFuZCBJJ20gcHV0dGlu
ZyBhbGwgQUNQSSBoZWFkZXIgY2xlYW51cHMgb24gaG9sZCB1bnRpbCBhbGwgd2FybmluZ3MNCj4g
b2YgdGhpcyBraW5kIGhhdmUgYmVlbiBmaXhlZCBieSB0aGVtLiAgT3RoZXJ3aXNlIGRvaW5nIHRo
b3NlIGNsZWFudXBzIG1ha2VzIGENCj4gbGl0dGxlIHNlbnNlIGluIG15IG9waW5pb24uDQoNCk9L
LCBub3Qgb25seSB0aGlzIHdhcm5pbmcsIHRoZXJlIGlzIGFub3RoZXIgd2FybmluZyBpbiBzZmlf
YWNwaS5jLg0KSSBkb3VidCB3aGV0aGVyIHRoZXkgYXJlIHN0cmljdGx5IHRlc3RlZCBiZWZvcmUg
dXBzdHJlYW1lZC4uLg0KVGhleSBhcmUgYWxsIGV4aXN0aW5nIHdhcm5pbmdzLg0KWW91IGNhbiBh
cHBseSBteSBuZXcgcGF0Y2ggYmVmb3JlIHRoZSBjbGVhbnVwIHNlcmllcy4NCg0KVGhhbmtzDQot
THYNCg0KPiANCj4gVGhhbmtzLA0KPiBSYWZhZWwNCg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lv Zheng Dec. 6, 2013, 1:51 a.m. UTC | #7
> From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-owner@vger.kernel.org] On Behalf Of Rafael J. Wysocki

> Sent: Friday, December 06, 2013 10:01 AM

> To: Zheng, Lv

> Cc: Andy Shevchenko; Wysocki, Rafael J; linux-acpi@vger.kernel.org; LKML

> Subject: Re: [PATCH] SFI: fix compilation warnings

> 

> On Friday, December 06, 2013 01:26:07 AM Zheng, Lv wrote:

> > > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]

> > > Sent: Friday, December 06, 2013 9:26 AM

> > >

> > > On Friday, December 06, 2013 01:08:45 AM Zheng, Lv wrote:

> > > > > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]

> > > > > Sent: Friday, December 06, 2013 6:37 AM

> > > > >

> > > > > On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote:

> > > > > > When build kernel with make W=1 we get the following compiler error.

> > > > > >

> > > > > > In file included from drivers/sfi/sfi_acpi.c:66:0:

> > > > > > include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:

> > > > > > include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]

> > > > > >   if (!acpi_table_parse(signature, handler))

> > > > > >   ^

> > > > > >   cc1: some warnings being treated as errors

> > > > > >

> > > > > > The patch changes acpi/acpi.h inclusion to linux/acpi.h.

> > > > > >

> > > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> > > > >

> > > > > OK

> > > > >

> > > > > Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing

> > > > > out entirely for the next cycle.

> > > >

> > > > No, I think Andy's patch is wrong.

> > >

> > > His patch may be wrong, but the warning in his changelog surely is real. :-)

> > >

> > > > This warning is existing before merging my fixes.

> > > >

> > > > Either we fix this warning or leave it as is.

> > > >

> > > > To fix it, you need to add 1 line in sfi_acpi.h rather than change the line.

> > > > Let me post a fix for this.

> > >

> > > Please do.  And I'm putting all ACPI header cleanups on hold until all warnings

> > > of this kind have been fixed by them.  Otherwise doing those cleanups makes a

> > > little sense in my opinion.

> >

> > OK, not only this warning, there is another warning in sfi_acpi.c.

> > I doubt whether they are strictly tested before upstreamed...

> > They are all existing warnings.

> > You can apply my new patch before the cleanup series.

> 

> Sorry, I'm already lost in the thick of patches. :-)

> 

> Please resend them all as a single series.


OK, I'll sort them again.

Thanks
-Lv

> 

> Thanks,

> Rafael

> 

> --

> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael J. Wysocki Dec. 6, 2013, 2 a.m. UTC | #8
On Friday, December 06, 2013 01:26:07 AM Zheng, Lv wrote:
> > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> > Sent: Friday, December 06, 2013 9:26 AM
> > 
> > On Friday, December 06, 2013 01:08:45 AM Zheng, Lv wrote:
> > > > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> > > > Sent: Friday, December 06, 2013 6:37 AM
> > > >
> > > > On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote:
> > > > > When build kernel with make W=1 we get the following compiler error.
> > > > >
> > > > > In file included from drivers/sfi/sfi_acpi.c:66:0:
> > > > > include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
> > > > > include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
> > > > >   if (!acpi_table_parse(signature, handler))
> > > > >   ^
> > > > >   cc1: some warnings being treated as errors
> > > > >
> > > > > The patch changes acpi/acpi.h inclusion to linux/acpi.h.
> > > > >
> > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > > >
> > > > OK
> > > >
> > > > Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing
> > > > out entirely for the next cycle.
> > >
> > > No, I think Andy's patch is wrong.
> > 
> > His patch may be wrong, but the warning in his changelog surely is real. :-)
> > 
> > > This warning is existing before merging my fixes.
> > >
> > > Either we fix this warning or leave it as is.
> > >
> > > To fix it, you need to add 1 line in sfi_acpi.h rather than change the line.
> > > Let me post a fix for this.
> > 
> > Please do.  And I'm putting all ACPI header cleanups on hold until all warnings
> > of this kind have been fixed by them.  Otherwise doing those cleanups makes a
> > little sense in my opinion.
> 
> OK, not only this warning, there is another warning in sfi_acpi.c.
> I doubt whether they are strictly tested before upstreamed...
> They are all existing warnings.
> You can apply my new patch before the cleanup series.

Sorry, I'm already lost in the thick of patches. :-)

Please resend them all as a single series.

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andy Shevchenko Dec. 9, 2013, 8:56 a.m. UTC | #9
On Fri, 2013-12-06 at 01:51 +0000, Zheng, Lv wrote:
> > From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-owner@vger.kernel.org] On Behalf Of Rafael J. Wysocki
> > Sent: Friday, December 06, 2013 10:01 AM
> > To: Zheng, Lv
> > Cc: Andy Shevchenko; Wysocki, Rafael J; linux-acpi@vger.kernel.org; LKML
> > Subject: Re: [PATCH] SFI: fix compilation warnings
> > 
> > On Friday, December 06, 2013 01:26:07 AM Zheng, Lv wrote:
> > > > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> > > > Sent: Friday, December 06, 2013 9:26 AM
> > > >
> > > > On Friday, December 06, 2013 01:08:45 AM Zheng, Lv wrote:
> > > > > > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> > > > > > Sent: Friday, December 06, 2013 6:37 AM
> > > > > >
> > > > > > On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote:
> > > > > > > When build kernel with make W=1 we get the following compiler error.
> > > > > > >
> > > > > > > In file included from drivers/sfi/sfi_acpi.c:66:0:
> > > > > > > include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’:
> > > > > > > include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration]
> > > > > > >   if (!acpi_table_parse(signature, handler))
> > > > > > >   ^
> > > > > > >   cc1: some warnings being treated as errors
> > > > > > >
> > > > > > > The patch changes acpi/acpi.h inclusion to linux/acpi.h.
> > > > > > >
> > > > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > > > > >
> > > > > > OK
> > > > > >
> > > > > > Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing
> > > > > > out entirely for the next cycle.
> > > > >
> > > > > No, I think Andy's patch is wrong.
> > > >
> > > > His patch may be wrong, but the warning in his changelog surely is real. :-)
> > > >
> > > > > This warning is existing before merging my fixes.
> > > > >
> > > > > Either we fix this warning or leave it as is.
> > > > >
> > > > > To fix it, you need to add 1 line in sfi_acpi.h rather than change the line.
> > > > > Let me post a fix for this.
> > > >
> > > > Please do.  And I'm putting all ACPI header cleanups on hold until all warnings
> > > > of this kind have been fixed by them.  Otherwise doing those cleanups makes a
> > > > little sense in my opinion.
> > >
> > > OK, not only this warning, there is another warning in sfi_acpi.c.
> > > I doubt whether they are strictly tested before upstreamed...
> > > They are all existing warnings.
> > > You can apply my new patch before the cleanup series.
> > 
> > Sorry, I'm already lost in the thick of patches. :-)
> > 
> > Please resend them all as a single series.
> 
> OK, I'll sort them again.

First of all, you are right. We have to have acpi/acpi.h _and_
linux/acpi.h in sfi_acpi.h.

Please, also check this one:
http://www.mail-archive.com/linux-gpio@vger.kernel.org/msg01521.html
diff mbox

Patch

diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c
index 0c9f419..d4dfcbe 100644
--- a/drivers/sfi/sfi_acpi.c
+++ b/drivers/sfi/sfi_acpi.c
@@ -60,7 +60,7 @@ 
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 #include <linux/sfi.h>
 #include <linux/sfi_acpi.h>
diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
index 2cfcb79..c9cab82 100644
--- a/include/linux/sfi_acpi.h
+++ b/include/linux/sfi_acpi.h
@@ -60,7 +60,7 @@ 
 #define _LINUX_SFI_ACPI_H
 
 #ifdef CONFIG_SFI
-#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
+#include <linux/acpi.h>
 
 extern int sfi_acpi_table_parse(char *signature, char *oem_id,
 				char *oem_table_id,