[alsa-devel] [RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[alsa-devel] [RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Lv Zheng]

CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
directly including <acpi/acpi.h>.  This patch cleans up such wrong
inclusions for Thinkpad ACPI users.

Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
Cc: ibm-acpi-devel@lists.sourceforge.net
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
 drivers/platform/x86/thinkpad_acpi.c |    1 -
 include/linux/thinkpad_acpi.h        |    2 ++
 sound/pci/hda/patch_conexant.c       |    1 -
 sound/pci/hda/patch_realtek.c        |    1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index defb6af..c114d7c 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -76,7 +76,6 @@
 #include <linux/dmi.h>
 #include <linux/jiffies.h>
 #include <linux/workqueue.h>
-#include <linux/acpi.h>
 #include <linux/pci_ids.h>
 #include <linux/thinkpad_acpi.h>
 #include <sound/core.h>
diff --git a/include/linux/thinkpad_acpi.h b/include/linux/thinkpad_acpi.h
index 361de59..02928eb 100644
--- a/include/linux/thinkpad_acpi.h
+++ b/include/linux/thinkpad_acpi.h
@@ -1,6 +1,8 @@
 #ifndef __THINKPAD_ACPI_H__
 #define __THINKPAD_ACPI_H__
 
+#include <linux/acpi.h>
+
 /* These two functions return 0 if success, or negative error code
    (e g -ENODEV if no led present) */
 
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 3fbf288..c2da489 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3243,7 +3243,6 @@ enum {
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 34de5dc..17306be 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3726,7 +3726,6 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec,
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
-- 
1.7.10.4

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Henrique de Moraes Holschuh]

On Wed, 18 Dec 2013, Lv Zheng wrote:
> CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
> directly including <acpi/acpi.h>.  This patch cleans up such wrong
> inclusions for Thinkpad ACPI users.

...

>  drivers/platform/x86/thinkpad_acpi.c |    1 -
>  include/linux/thinkpad_acpi.h        |    2 ++
>  sound/pci/hda/patch_conexant.c       |    1 -
>  sound/pci/hda/patch_realtek.c        |    1 -

I'd prefer if you left the include outside of thinkpad_acpi.h, and just fix
the include in the two ALSA users.

We might add some extra stuff to thinkpad_acpi.h someday, and not everything
thinkpad_acpi does that might be useful to export to other areas of the
kernel would require acpi.h.

Looking at patch_conexant and patch_realtek, it might be better to actually
move the "am I running on a thinkpad" stuff they use acpi.h for into
thinkpad_acpi, and provide a prototype for that in thinkpad_acpi.h.

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh

Re: [alsa-devel] [RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Takashi Iwai]

At Wed, 18 Dec 2013 09:41:17 -0200,
Henrique de Moraes Holschuh wrote:
> 
> On Wed, 18 Dec 2013, Lv Zheng wrote:
> > CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
> > directly including <acpi/acpi.h>.  This patch cleans up such wrong
> > inclusions for Thinkpad ACPI users.
> 
> ...
> 
> >  drivers/platform/x86/thinkpad_acpi.c |    1 -
> >  include/linux/thinkpad_acpi.h        |    2 ++
> >  sound/pci/hda/patch_conexant.c       |    1 -
> >  sound/pci/hda/patch_realtek.c        |    1 -
> 
> I'd prefer if you left the include outside of thinkpad_acpi.h, and just fix
> the include in the two ALSA users.

Agreed.

> We might add some extra stuff to thinkpad_acpi.h someday, and not everything
> thinkpad_acpi does that might be useful to export to other areas of the
> kernel would require acpi.h.
> 
> Looking at patch_conexant and patch_realtek, it might be better to actually
> move the "am I running on a thinkpad" stuff they use acpi.h for into
> thinkpad_acpi, and provide a prototype for that in thinkpad_acpi.h.

True, but we don't want to bind with thinkpad_acpi before identified
that it's a thinkpad, so the code needs to be in hd-audio codec
driver.


thanks,

Takashi

RE: [alsa-devel] [RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Zheng, Lv]

Hi, Takashi and Henrique

Thanks for reviewing and commenting.

> From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-owner@vger.kernel.org] On Behalf Of Takashi Iwai
> Sent: Wednesday, December 18, 2013 9:06 PM
> 
> At Wed, 18 Dec 2013 09:41:17 -0200,
> Henrique de Moraes Holschuh wrote:
> >
> > On Wed, 18 Dec 2013, Lv Zheng wrote:
> > > CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
> > > directly including <acpi/acpi.h>.  This patch cleans up such wrong
> > > inclusions for Thinkpad ACPI users.
> >
> > ...
> >
> > >  drivers/platform/x86/thinkpad_acpi.c |    1 -
> > >  include/linux/thinkpad_acpi.h        |    2 ++
> > >  sound/pci/hda/patch_conexant.c       |    1 -
> > >  sound/pci/hda/patch_realtek.c        |    1 -
> >
> > I'd prefer if you left the include outside of thinkpad_acpi.h, and just fix
> > the include in the two ALSA users.
> 
> Agreed.
> 
> > We might add some extra stuff to thinkpad_acpi.h someday, and not everything
> > thinkpad_acpi does that might be useful to export to other areas of the
> > kernel would require acpi.h.
> >
> > Looking at patch_conexant and patch_realtek, it might be better to actually
> > move the "am I running on a thinkpad" stuff they use acpi.h for into
> > thinkpad_acpi, and provide a prototype for that in thinkpad_acpi.h.
> 
> True, but we don't want to bind with thinkpad_acpi before identified
> that it's a thinkpad, so the code needs to be in hd-audio codec
> driver.
> 

It looks to me like that there is a relationship between two Henrique's suggestions.
His opinion is all ACPI stuff should be bound into thinkpad_acpi.c, that's why he suggested not to include <linux/acpi.h> in <linux/thinkpad_acpi.h>.
So we might address both of them in order to follow.

I'm not sure if your opinion is: the hd-audio codec driver's needs cannot be met by addressing the second comment.
And I'm not the right person that is able to test such code restructuring work.
The target of this patchset is cleaning up wrong <acpi/acpi.h> inclusions, so let me focus on the first comment.

Can I just update this patch with <acpi/acpi.h> inclusions replaced by <linux/acpi.h> inclusions?

Thanks and best regards
-Lv

> 
> thanks,
> 
> Takashi
> --
> 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

Re: [alsa-devel] [RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Takashi Iwai]

At Fri, 20 Dec 2013 00:28:02 +0000,
Zheng, Lv wrote:
> 
> Hi, Takashi and Henrique
> 
> Thanks for reviewing and commenting.
> 
> > From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-owner@vger.kernel.org] On Behalf Of Takashi Iwai
> > Sent: Wednesday, December 18, 2013 9:06 PM
> > 
> > At Wed, 18 Dec 2013 09:41:17 -0200,
> > Henrique de Moraes Holschuh wrote:
> > >
> > > On Wed, 18 Dec 2013, Lv Zheng wrote:
> > > > CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
> > > > directly including <acpi/acpi.h>.  This patch cleans up such wrong
> > > > inclusions for Thinkpad ACPI users.
> > >
> > > ...
> > >
> > > >  drivers/platform/x86/thinkpad_acpi.c |    1 -
> > > >  include/linux/thinkpad_acpi.h        |    2 ++
> > > >  sound/pci/hda/patch_conexant.c       |    1 -
> > > >  sound/pci/hda/patch_realtek.c        |    1 -
> > >
> > > I'd prefer if you left the include outside of thinkpad_acpi.h, and just fix
> > > the include in the two ALSA users.
> > 
> > Agreed.
> > 
> > > We might add some extra stuff to thinkpad_acpi.h someday, and not everything
> > > thinkpad_acpi does that might be useful to export to other areas of the
> > > kernel would require acpi.h.
> > >
> > > Looking at patch_conexant and patch_realtek, it might be better to actually
> > > move the "am I running on a thinkpad" stuff they use acpi.h for into
> > > thinkpad_acpi, and provide a prototype for that in thinkpad_acpi.h.
> > 
> > True, but we don't want to bind with thinkpad_acpi before identified
> > that it's a thinkpad, so the code needs to be in hd-audio codec
> > driver.
> > 
> 
> It looks to me like that there is a relationship between two Henrique's suggestions.
> His opinion is all ACPI stuff should be bound into thinkpad_acpi.c, that's why he suggested not to include <linux/acpi.h> in <linux/thinkpad_acpi.h>.
> So we might address both of them in order to follow.
> 
> I'm not sure if your opinion is: the hd-audio codec driver's needs cannot be met by addressing the second comment.

My position is that some acpi code is needed in hd-audio codec driver
because we need to probe thinkpad before binding with thinkpad_acpi.
The codec driver is used by all machines with the same codec chips,
and only few are thinkpads, so it's better not to bind statically for
the rest others.

> And I'm not the right person that is able to test such code restructuring work.
> The target of this patchset is cleaning up wrong <acpi/acpi.h> inclusions, so let me focus on the first comment.
> 
> Can I just update this patch with <acpi/acpi.h> inclusions replaced by <linux/acpi.h> inclusions?

Yes, that suffices.


Takashi

[RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Lv Zheng]

CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
directly including <acpi/acpi.h>.  This patch cleans up such wrong
inclusions for Thinkpad ACPI users.

Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
Cc: ibm-acpi-devel@lists.sourceforge.net
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
 drivers/platform/x86/thinkpad_acpi.c |    1 -
 include/linux/thinkpad_acpi.h        |    2 ++
 sound/pci/hda/patch_conexant.c       |    1 -
 sound/pci/hda/patch_realtek.c        |    1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index defb6af..c114d7c 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -76,7 +76,6 @@
 #include <linux/dmi.h>
 #include <linux/jiffies.h>
 #include <linux/workqueue.h>
-#include <linux/acpi.h>
 #include <linux/pci_ids.h>
 #include <linux/thinkpad_acpi.h>
 #include <sound/core.h>
diff --git a/include/linux/thinkpad_acpi.h b/include/linux/thinkpad_acpi.h
index 361de59..02928eb 100644
--- a/include/linux/thinkpad_acpi.h
+++ b/include/linux/thinkpad_acpi.h
@@ -1,6 +1,8 @@
 #ifndef __THINKPAD_ACPI_H__
 #define __THINKPAD_ACPI_H__
 
+#include <linux/acpi.h>
+
 /* These two functions return 0 if success, or negative error code
    (e g -ENODEV if no led present) */
 
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 3fbf288..c2da489 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3243,7 +3243,6 @@ enum {
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 34de5dc..17306be 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3726,7 +3726,6 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec,
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
-- 
1.7.10.4

[RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Lv Zheng]

CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
directly including <acpi/acpi.h>.  This patch cleans up such wrong
inclusions for Thinkpad ACPI users.

Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
Cc: ibm-acpi-devel@lists.sourceforge.net
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
 drivers/platform/x86/thinkpad_acpi.c |    1 -
 include/linux/thinkpad_acpi.h        |    2 ++
 sound/pci/hda/patch_conexant.c       |    1 -
 sound/pci/hda/patch_realtek.c        |    1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index defb6af..c114d7c 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -76,7 +76,6 @@
 #include <linux/dmi.h>
 #include <linux/jiffies.h>
 #include <linux/workqueue.h>
-#include <linux/acpi.h>
 #include <linux/pci_ids.h>
 #include <linux/thinkpad_acpi.h>
 #include <sound/core.h>
diff --git a/include/linux/thinkpad_acpi.h b/include/linux/thinkpad_acpi.h
index 361de59..02928eb 100644
--- a/include/linux/thinkpad_acpi.h
+++ b/include/linux/thinkpad_acpi.h
@@ -1,6 +1,8 @@
 #ifndef __THINKPAD_ACPI_H__
 #define __THINKPAD_ACPI_H__
 
+#include <linux/acpi.h>
+
 /* These two functions return 0 if success, or negative error code
    (e g -ENODEV if no led present) */
 
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 3fbf288..c2da489 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3243,7 +3243,6 @@ enum {
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 34de5dc..17306be 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3726,7 +3726,6 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec,
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
-- 
1.7.10.4

[UPDATE RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Lv Zheng]

CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
directly including <acpi/acpi.h>.  This patch cleans up such wrong
inclusions for Thinkpad ACPI users.

Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
Cc: ibm-acpi-devel@lists.sourceforge.net
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
 sound/pci/hda/patch_conexant.c |    2 +-
 sound/pci/hda/patch_realtek.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 3fbf288..6df4c35 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3243,7 +3243,7 @@ enum {
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
+#include <linux/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 34de5dc..5dca90e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3726,7 +3726,7 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec,
 #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
 
 #include <linux/thinkpad_acpi.h>
-#include <acpi/acpi.h>
+#include <linux/acpi.h>
 
 static int (*led_set_func)(int, bool);
 
-- 
1.7.10

Re: [UPDATE RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

[Takashi Iwai]

At Fri, 20 Dec 2013 16:30:42 +0800,
Lv Zheng wrote:
> 
> CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
> directly including <acpi/acpi.h>.  This patch cleans up such wrong
> inclusions for Thinkpad ACPI users.
> 
> Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.de>
> Cc: alsa-devel@alsa-project.org
> Cc: ibm-acpi-devel@lists.sourceforge.net
> Cc: platform-driver-x86@vger.kernel.org
> Signed-off-by: Lv Zheng <lv.zheng@intel.com>

Applied to sound git tree (with a different subject suffix), thanks.


Takashi

> ---
>  sound/pci/hda/patch_conexant.c |    2 +-
>  sound/pci/hda/patch_realtek.c  |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
> index 3fbf288..6df4c35 100644
> --- a/sound/pci/hda/patch_conexant.c
> +++ b/sound/pci/hda/patch_conexant.c
> @@ -3243,7 +3243,7 @@ enum {
>  #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
>  
>  #include <linux/thinkpad_acpi.h>
> -#include <acpi/acpi.h>
> +#include <linux/acpi.h>
>  
>  static int (*led_set_func)(int, bool);
>  
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 34de5dc..5dca90e 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -3726,7 +3726,7 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec,
>  #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
>  
>  #include <linux/thinkpad_acpi.h>
> -#include <acpi/acpi.h>
> +#include <linux/acpi.h>
>  
>  static int (*led_set_func)(int, bool);
>  
> -- 
> 1.7.10
> 

[PATCH v2 0/7] ACPICA: Enable ACPICA prototypes for CONFIG_ACPI=n builds.

[Lv Zheng]

This is the last series for ACPICA header inclusion cleanups.
The whole story can be found below:
  1. Unsafe inclusions:
     origin: https://lkml.org/lkml/2013/11/22/510
     merged: https://lkml.org/lkml/2013/12/6/79
  2. Header orders:
     origin: https://lkml.org/lkml/2014/4/8/57
     merged: https://lkml.org/lkml/2014/5/12/111
  3. Header stubs:
     origin: https://lkml.org/lkml/2014/12/18/149
     merged: https://lkml.org/lkml/2014/4/29/716

This patchset contains patches that are parts of the last series sent
before, so it is marked as v2 belonging to the same thread as this series:
  https://lkml.org/lkml/2014/12/18/149

Now we have cleaned up all mis-ordered ACPICA headers and implemented stubs
for ACPICA prototypes (functions, global variables, macros), we finally can
enable ACPICA headers for CONFIG_ACPI=n builds so that all ACPICA defined
types are visible to all kernel source files.

After exposing ACPICA types to all kernel sources, we can also sort the
final wrong <acpi/acpi.h> inclusion out of <linux/sfi_acpi.h>.

This patchset also includes a rule enforcement patch to avoid future
inclusion mistakes.

The patch set has passed a build/boot test on the following machines:
Dell Inspiron Mini 1010 (i386)
HP Compaq 8200 Elite SFF PC (x86-64)
With the following kernel configuration items enabled:
  All drivers/acpi configurations
  All platform drivers
  All ACPI drivers
  4 DRM drivers that implement ACPI opregion
  All buses with ACPI bindings
  All cpufreq configurations
  All xen configurations
  All ACPI table drivers
They are tested twice with CONFIG_ACPI enabled/disabled.

Also allyes/allno/allmod tests are done for ARCH=i386 and ARCH=x86_64.

A boot test has been done to ARCH=x86_64 default configuration and it is
confirmed that the ACPI devices are successfully created under
/sys/bus/acpi/devices when CONFIG_ACPI is enabled.

Lv Zheng (7):
  ACPICA: Linux: Add stub support for Linux specific variables and
    functions.
  ACPICA: Linux: Add stub implementation of ACPICA 64-bit mathematics.
  ACPICA: Linux: Add configuration item to indicate the architecture
    specific support.
  ACPICA: Linux: Allow ACPICA inclusion for CONFIG_ACPI=n builds.
  ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper -
    table definitions.
  ACPI: Cleanup useless ACPI inclusion.
  ACPI: Add support to force header inclusion rules for <acpi/acpi.h>.

 arch/ia64/Kconfig                 |    1 +
 arch/x86/Kconfig                  |    1 +
 drivers/acpi/Kconfig              |    4 ++++
 drivers/acpi/acpica/Makefile      |    2 +-
 drivers/acpi/bus.c                |    3 ---
 include/acpi/acpixf.h             |   28 +++++++++++++++++-----------
 include/acpi/platform/aclinux.h   |   12 ++++++++++++
 include/acpi/platform/aclinuxex.h |   22 ++++++++++++++++++++++
 include/linux/acpi.h              |    6 +++---
 include/linux/sfi_acpi.h          |    3 ---
 sound/soc/intel/sst-haswell-dsp.c |    3 ---
 11 files changed, 61 insertions(+), 24 deletions(-)

-- 
1.7.10

[PATCH v2 6/7] ACPI: Cleanup useless ACPI inclusion.

[Lv Zheng]

The sst-haswell-dsp.c is an ACPI independent file, this patch removes
ACPI header files for it.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
---
 sound/soc/intel/sst-haswell-dsp.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c
index 535f517..ecc5057 100644
--- a/sound/soc/intel/sst-haswell-dsp.c
+++ b/sound/soc/intel/sst-haswell-dsp.c
@@ -28,9 +28,6 @@
 #include <linux/firmware.h>
 #include <linux/pm_runtime.h>
 
-#include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-
 #include "sst-dsp.h"
 #include "sst-dsp-priv.h"
 #include "sst-haswell-ipc.h"
-- 
1.7.10

Re: [PATCH v2 6/7] ACPI: Cleanup useless ACPI inclusion.

[Rafael J. Wysocki]

On Monday, July 07, 2014 12:17:40 PM Lv Zheng wrote:
> The sst-haswell-dsp.c is an ACPI independent file, this patch removes
> ACPI header files for it.

This appears to be independent of the rest of the series.  Is that correct?

> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
> Cc: Liam Girdwood <lgirdwood@gmail.com>
> Cc: Mark Brown <broonie@kernel.org>
> Cc: alsa-devel@alsa-project.org
> ---
>  sound/soc/intel/sst-haswell-dsp.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c
> index 535f517..ecc5057 100644
> --- a/sound/soc/intel/sst-haswell-dsp.c
> +++ b/sound/soc/intel/sst-haswell-dsp.c
> @@ -28,9 +28,6 @@
>  #include <linux/firmware.h>
>  #include <linux/pm_runtime.h>
>  
> -#include <linux/acpi.h>
> -#include <acpi/acpi_bus.h>
> -
>  #include "sst-dsp.h"
>  #include "sst-dsp-priv.h"
>  #include "sst-haswell-ipc.h"
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

RE: [PATCH v2 6/7] ACPI: Cleanup useless ACPI inclusion.

[Zheng, Lv]

Hi,

> From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-owner@vger.kernel.org] On Behalf Of Rafael J. Wysocki
> Sent: Tuesday, July 08, 2014 5:24 AM
> 
> On Monday, July 07, 2014 12:17:40 PM Lv Zheng wrote:
> > The sst-haswell-dsp.c is an ACPI independent file, this patch removes
> > ACPI header files for it.
> 
> This appears to be independent of the rest of the series.  Is that correct?

Yes.
Now the <acpi/acpi_bus.h> inclusion in this file is the only one after we've cleaned up the others.

Best regards
-Lv

> > Signed-off-by: Lv Zheng <lv.zheng@intel.com>
> > Cc: Liam Girdwood <lgirdwood@gmail.com>
> > Cc: Mark Brown <broonie@kernel.org>
> > Cc: alsa-devel@alsa-project.org
> > ---
> >  sound/soc/intel/sst-haswell-dsp.c |    3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c
> > index 535f517..ecc5057 100644
> > --- a/sound/soc/intel/sst-haswell-dsp.c
> > +++ b/sound/soc/intel/sst-haswell-dsp.c
> > @@ -28,9 +28,6 @@
> >  #include <linux/firmware.h>
> >  #include <linux/pm_runtime.h>
> >
> > -#include <linux/acpi.h>
> > -#include <acpi/acpi_bus.h>
> > -
> >  #include "sst-dsp.h"
> >  #include "sst-dsp-priv.h"
> >  #include "sst-haswell-ipc.h"
> >
> 
> --
> I speak only for myself.
> Rafael J. Wysocki, Intel Open Source Technology Center.
> --
> 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

[PATCH v3 0/7] ACPICA: Enable ACPICA prototypes for CONFIG_ACPI=n builds.

[Lv Zheng]

v3:
 PATCH 3/7 updated to remove new Kconfig item.

This is the last series for ACPICA header inclusion cleanups.
The whole story can be found below:
  1. Unsafe inclusions:
     origin: https://lkml.org/lkml/2013/11/22/510
     merged: https://lkml.org/lkml/2013/12/6/79
  2. Header orders:
     origin: https://lkml.org/lkml/2014/4/8/57
     merged: https://lkml.org/lkml/2014/5/12/111
  3. Header stubs:
     origin: https://lkml.org/lkml/2014/12/18/149
     merged: https://lkml.org/lkml/2014/4/29/716

This patchset contains patches that are parts of the last series sent
before, so it is marked as v2 belonging to the same thread as this series:
  https://lkml.org/lkml/2014/12/18/149

Now we have cleaned up all mis-ordered ACPICA headers and implemented stubs
for ACPICA prototypes (functions, global variables, macros), we finally can
enable ACPICA headers for CONFIG_ACPI=n builds so that all ACPICA defined
types are visible to all kernel source files.

After exposing ACPICA types to all kernel sources, we can also sort the
final wrong <acpi/acpi.h> inclusion out of <linux/sfi_acpi.h>.

This patchset also includes a rule enforcement patch to avoid future
inclusion mistakes.

The patch set has passed a build/boot test on the following machines:
Dell Inspiron Mini 1010 (i386)
HP Compaq 8200 Elite SFF PC (x86-64)
With the following kernel configuration items enabled:
  All drivers/acpi configurations
  All platform drivers
  All ACPI drivers
  4 DRM drivers that implement ACPI opregion
  All buses with ACPI bindings
  All cpufreq configurations
  All xen configurations
  All ACPI table drivers
They are tested twice with CONFIG_ACPI enabled/disabled.

Also allyes/allno/allmod tests are done for ARCH=i386 and ARCH=x86_64.

A boot test has been done to ARCH=x86_64 default configuration and it is
confirmed that the ACPI devices are successfully created under
/sys/bus/acpi/devices when CONFIG_ACPI is enabled.

Lv Zheng (7):
  ACPICA: Linux: Add stub support for Linux specific variables and
    functions.
  ACPICA: Linux: Add stub implementation of ACPICA 64-bit mathematics.
  ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.
  ACPICA: Linux: Allow ACPICA inclusion for CONFIG_ACPI=n builds.
  ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper -
    table definitions.
  ACPI: Add support to force header inclusion rules for <acpi/acpi.h>.
  ACPI: Cleanup useless ACPI inclusion.

 arch/ia64/include/asm/acenv.h     |    4 ----
 arch/x86/include/asm/acenv.h      |    4 ----
 drivers/acpi/acpica/Makefile      |    2 +-
 drivers/acpi/bus.c                |    3 ---
 include/acpi/acpixf.h             |   28 +++++++++++++++++-----------
 include/acpi/platform/aclinux.h   |   12 ++++++++++++
 include/acpi/platform/aclinuxex.h |   22 ++++++++++++++++++++++
 include/linux/acpi.h              |    6 +++---
 include/linux/sfi_acpi.h          |    3 ---
 sound/soc/intel/sst-haswell-dsp.c |    3 ---
 10 files changed, 55 insertions(+), 32 deletions(-)

-- 
1.7.10

[PATCH v3 7/7] ACPI: Cleanup useless ACPI inclusion.

[Lv Zheng]

The sst-haswell-dsp.c is an ACPI independent file, this patch removes
ACPI header files for it.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
---
 sound/soc/intel/sst-haswell-dsp.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c
index 535f517..ecc5057 100644
--- a/sound/soc/intel/sst-haswell-dsp.c
+++ b/sound/soc/intel/sst-haswell-dsp.c
@@ -28,9 +28,6 @@
 #include <linux/firmware.h>
 #include <linux/pm_runtime.h>
 
-#include <linux/acpi.h>
-#include <acpi/acpi_bus.h>
-
 #include "sst-dsp.h"
 #include "sst-dsp-priv.h"
 #include "sst-haswell-ipc.h"
-- 
1.7.10

Re: [PATCH v3 7/7] ACPI: Cleanup useless ACPI inclusion.

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

On Wed, Jul 16, 2014 at 04:59:02PM +0800, Lv Zheng wrote:
> The sst-haswell-dsp.c is an ACPI independent file, this patch removes
> ACPI header files for it.

Applied, thanks.  Please use subject lines matching the style for the
subsystem and send at least the cover letter for the series to everyone
so that they know what's going on with dependencies and so on.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH v3 7/7] ACPI: Cleanup useless ACPI inclusion.

[Rafael J. Wysocki]

On Wednesday, July 16, 2014 01:07:50 PM Mark Brown wrote:
> 
> --5me2qT3T17SWzdxI
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: inline
> 
> On Wed, Jul 16, 2014 at 04:59:02PM +0800, Lv Zheng wrote:
> > The sst-haswell-dsp.c is an ACPI independent file, this patch removes
> > ACPI header files for it.
> 
> Applied, thanks.  Please use subject lines matching the style for the
> subsystem and send at least the cover letter for the series to everyone
> so that they know what's going on with dependencies and so on.

Lv thought that this would go through the ACPI tree I suppose.

Rafael

Re: [PATCH v3 7/7] ACPI: Cleanup useless ACPI inclusion.

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

On Wed, Jul 16, 2014 at 11:46:14PM +0200, Rafael J. Wysocki wrote:
> On Wednesday, July 16, 2014 01:07:50 PM Mark Brown wrote:
> > On Wed, Jul 16, 2014 at 04:59:02PM +0800, Lv Zheng wrote:

> > > The sst-haswell-dsp.c is an ACPI independent file, this patch removes
> > > ACPI header files for it.

> > Applied, thanks.  Please use subject lines matching the style for the
> > subsystem and send at least the cover letter for the series to everyone
> > so that they know what's going on with dependencies and so on.

> Lv thought that this would go through the ACPI tree I suppose.

Even so the subject line should still line up (it's part of how some of
us pick out which mail to read).

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

RE: [PATCH v3 7/7] ACPI: Cleanup useless ACPI inclusion.

[Zheng, Lv]

Hi,

> From: Mark Brown [mailto:broonie@kernel.org]
> Sent: Thursday, July 17, 2014 5:35 AM
> 
> On Wed, Jul 16, 2014 at 11:46:14PM +0200, Rafael J. Wysocki wrote:
> > On Wednesday, July 16, 2014 01:07:50 PM Mark Brown wrote:
> > > On Wed, Jul 16, 2014 at 04:59:02PM +0800, Lv Zheng wrote:
> 
> > > > The sst-haswell-dsp.c is an ACPI independent file, this patch removes
> > > > ACPI header files for it.
> 
> > > Applied, thanks.  Please use subject lines matching the style for the
> > > subsystem and send at least the cover letter for the series to everyone
> > > so that they know what's going on with dependencies and so on.
> 
> > Lv thought that this would go through the ACPI tree I suppose.
> 
> Even so the subject line should still line up (it's part of how some of
> us pick out which mail to read).

I just didn't notice this. :-)
I'll take care next time.

Thanks and best regards
-Lv