Patchwork pci: Remove unnecessary dependency between PME and ACPI.

login
register
mail settings
Submitter Bjorn Helgaas
Date April 11, 2013, 11:44 p.m.
Message ID <20130411234426.GA10196@google.com>
Download mbox | patch
Permalink /patch/235948/
State Accepted
Headers show

Comments

Bjorn Helgaas - April 11, 2013, 11:44 p.m.
On Thu, Feb 21, 2013 at 03:53:29PM +0000, Andrew Murray wrote:
> Signed-off-by: Andrew Murray <Andrew.Murray@arm.com>
> Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
> ---
>  drivers/pci/pcie/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index 6c8bc58..4cccd8c 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -82,4 +82,4 @@ endchoice
>  
>  config PCIE_PME
>  	def_bool y
> -	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI
> +	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL

I think we can go even further and remove the ACPI-related #includes
as in the patch below.  Any objections to this?


commit 8bde83b5f5519b630e7630fb735f76c184c74289
Author: Bjorn Helgaas <bhelgaas@google.com>
Date:   Thu Apr 11 17:36:50 2013 -0600

    PCI: Remove unnecessary dependencies between PME and ACPI
    
    PCIe PME doesn't depend on ACPI, so remove the #includes and
    Kconfig dependency.
    
    Based-on-patch-by: Andrew Murray <Andrew.Murray@arm.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andrew Murray - April 12, 2013, 7:42 a.m.
On Fri, Apr 12, 2013 at 12:44:26AM +0100, Bjorn Helgaas wrote:
> On Thu, Feb 21, 2013 at 03:53:29PM +0000, Andrew Murray wrote:
> > Signed-off-by: Andrew Murray <Andrew.Murray@arm.com>
> > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
> > ---
> >  drivers/pci/pcie/Kconfig |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> > index 6c8bc58..4cccd8c 100644
> > --- a/drivers/pci/pcie/Kconfig
> > +++ b/drivers/pci/pcie/Kconfig
> > @@ -82,4 +82,4 @@ endchoice
> >  
> >  config PCIE_PME
> >  	def_bool y
> > -	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI
> > +	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
> 
> I think we can go even further and remove the ACPI-related #includes
> as in the patch below.  Any objections to this?
> 
> 
> commit 8bde83b5f5519b630e7630fb735f76c184c74289
> Author: Bjorn Helgaas <bhelgaas@google.com>
> Date:   Thu Apr 11 17:36:50 2013 -0600
> 
>     PCI: Remove unnecessary dependencies between PME and ACPI
>     
>     PCIe PME doesn't depend on ACPI, so remove the #includes and
>     Kconfig dependency.
>     
>     Based-on-patch-by: Andrew Murray <Andrew.Murray@arm.com>
>     Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> 
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index fde4a32..569f82f 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -82,4 +82,4 @@ endchoice
>  
>  config PCIE_PME
>  	def_bool y
> -	depends on PCIEPORTBUS && PM_RUNTIME && ACPI
> +	depends on PCIEPORTBUS && PM_RUNTIME
> diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
> index 9ca0dc9..795db1f 100644
> --- a/drivers/pci/pcie/pme.c
> +++ b/drivers/pci/pcie/pme.c
> @@ -19,8 +19,6 @@
>  #include <linux/interrupt.h>
>  #include <linux/device.h>
>  #include <linux/pcieport_if.h>
> -#include <linux/acpi.h>
> -#include <linux/pci-acpi.h>
>  #include <linux/pm_runtime.h>
>  
>  #include "../pci.h"
> --

Looks good to me.

Andrew Murray

> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" 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 - April 12, 2013, 11:13 a.m.
On Thursday, April 11, 2013 05:44:26 PM Bjorn Helgaas wrote:
> On Thu, Feb 21, 2013 at 03:53:29PM +0000, Andrew Murray wrote:
> > Signed-off-by: Andrew Murray <Andrew.Murray@arm.com>
> > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
> > ---
> >  drivers/pci/pcie/Kconfig |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> > index 6c8bc58..4cccd8c 100644
> > --- a/drivers/pci/pcie/Kconfig
> > +++ b/drivers/pci/pcie/Kconfig
> > @@ -82,4 +82,4 @@ endchoice
> >  
> >  config PCIE_PME
> >  	def_bool y
> > -	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI
> > +	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
> 
> I think we can go even further and remove the ACPI-related #includes
> as in the patch below.  Any objections to this?
> 
> 
> commit 8bde83b5f5519b630e7630fb735f76c184c74289
> Author: Bjorn Helgaas <bhelgaas@google.com>
> Date:   Thu Apr 11 17:36:50 2013 -0600
> 
>     PCI: Remove unnecessary dependencies between PME and ACPI
>     
>     PCIe PME doesn't depend on ACPI, so remove the #includes and
>     Kconfig dependency.
>     
>     Based-on-patch-by: Andrew Murray <Andrew.Murray@arm.com>
>     Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index fde4a32..569f82f 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -82,4 +82,4 @@ endchoice
>  
>  config PCIE_PME
>  	def_bool y
> -	depends on PCIEPORTBUS && PM_RUNTIME && ACPI
> +	depends on PCIEPORTBUS && PM_RUNTIME
> diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
> index 9ca0dc9..795db1f 100644
> --- a/drivers/pci/pcie/pme.c
> +++ b/drivers/pci/pcie/pme.c
> @@ -19,8 +19,6 @@
>  #include <linux/interrupt.h>
>  #include <linux/device.h>
>  #include <linux/pcieport_if.h>
> -#include <linux/acpi.h>
> -#include <linux/pci-acpi.h>
>  #include <linux/pm_runtime.h>
>  
>  #include "../pci.h"
> --
> 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
Bjorn Helgaas - April 12, 2013, 7:03 p.m.
On Fri, Apr 12, 2013 at 5:13 AM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Thursday, April 11, 2013 05:44:26 PM Bjorn Helgaas wrote:
>> On Thu, Feb 21, 2013 at 03:53:29PM +0000, Andrew Murray wrote:
>> > Signed-off-by: Andrew Murray <Andrew.Murray@arm.com>
>> > Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
>> > ---
>> >  drivers/pci/pcie/Kconfig |    2 +-
>> >  1 files changed, 1 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
>> > index 6c8bc58..4cccd8c 100644
>> > --- a/drivers/pci/pcie/Kconfig
>> > +++ b/drivers/pci/pcie/Kconfig
>> > @@ -82,4 +82,4 @@ endchoice
>> >
>> >  config PCIE_PME
>> >     def_bool y
>> > -   depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI
>> > +   depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
>>
>> I think we can go even further and remove the ACPI-related #includes
>> as in the patch below.  Any objections to this?
>>
>>
>> commit 8bde83b5f5519b630e7630fb735f76c184c74289
>> Author: Bjorn Helgaas <bhelgaas@google.com>
>> Date:   Thu Apr 11 17:36:50 2013 -0600
>>
>>     PCI: Remove unnecessary dependencies between PME and ACPI
>>
>>     PCIe PME doesn't depend on ACPI, so remove the #includes and
>>     Kconfig dependency.
>>
>>     Based-on-patch-by: Andrew Murray <Andrew.Murray@arm.com>
>>     Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>
> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

I applied this for v3.10, thanks!

Bjorn

>> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
>> index fde4a32..569f82f 100644
>> --- a/drivers/pci/pcie/Kconfig
>> +++ b/drivers/pci/pcie/Kconfig
>> @@ -82,4 +82,4 @@ endchoice
>>
>>  config PCIE_PME
>>       def_bool y
>> -     depends on PCIEPORTBUS && PM_RUNTIME && ACPI
>> +     depends on PCIEPORTBUS && PM_RUNTIME
>> diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
>> index 9ca0dc9..795db1f 100644
>> --- a/drivers/pci/pcie/pme.c
>> +++ b/drivers/pci/pcie/pme.c
>> @@ -19,8 +19,6 @@
>>  #include <linux/interrupt.h>
>>  #include <linux/device.h>
>>  #include <linux/pcieport_if.h>
>> -#include <linux/acpi.h>
>> -#include <linux/pci-acpi.h>
>>  #include <linux/pm_runtime.h>
>>
>>  #include "../pci.h"
>> --
>> 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
> --
> I speak only for myself.
> Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index fde4a32..569f82f 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -82,4 +82,4 @@  endchoice
 
 config PCIE_PME
 	def_bool y
-	depends on PCIEPORTBUS && PM_RUNTIME && ACPI
+	depends on PCIEPORTBUS && PM_RUNTIME
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
index 9ca0dc9..795db1f 100644
--- a/drivers/pci/pcie/pme.c
+++ b/drivers/pci/pcie/pme.c
@@ -19,8 +19,6 @@ 
 #include <linux/interrupt.h>
 #include <linux/device.h>
 #include <linux/pcieport_if.h>
-#include <linux/acpi.h>
-#include <linux/pci-acpi.h>
 #include <linux/pm_runtime.h>
 
 #include "../pci.h"