Skip to contentSkip to conversation

pci: Remove unnecessary dependency between PME and ACPI.

PATCH Applied Andrew Murray 3 participants 5 messages Feb 21, 2013 – Apr 12, 2013

Subsystems (2)
ACPI PCI
lore
Share & tools
lore

Andrew Murray

author
#0 lore raw

PATCH 1/1 pci: Remove unnecessary dependency between PME and ACPI.

Signed-off-by Andrew Murray <[email protected]>
Signed-off-by Liviu Dudau <[email protected]>
---
 drivers/pci/pcie/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/pcie/Kconfig +1 -1
index 6c8bc58..4cccd8c 100644
@@ -82,4 +82,4 @@ endchoice
 
 config PCIE_PME
 	def_bool y
-	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI
+	depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL
Signature · 1 line
1.7.0.4
maintainer
#1 lore raw
Quoted 11 lines · Andrew Murray
Signed-off-by Andrew Murray <[email protected]>
Signed-off-by Liviu Dudau <[email protected]>
---
 drivers/pci/pcie/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/pcie/Kconfig +0 -0
index 6c8bc58..4cccd8c 100644

drivers/pci/pcie/Kconfig endchoice · line 85

Quoted 5 lines
drivers/pci/pcie/Kconfig +1 -1
@@ -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 <[email protected]>
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 <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>
drivers/pci/pcie/Kconfig +1 -1
index fde4a32..569f82f 100644
@@ -82,4 +82,4 @@ endchoice
 
 config PCIE_PME
 	def_bool y
-	depends on PCIEPORTBUS && PM_RUNTIME && ACPI
+	depends on PCIEPORTBUS && PM_RUNTIME
drivers/pci/pcie/pme.c +0 -2
index 9ca0dc9..795db1f 100644
@@ -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"
author
#2 lore raw
Quoted 49 lines · Bjorn Helgaas
Quoted 11 lines · Andrew Murray
Signed-off-by Andrew Murray <[email protected]>
Signed-off-by Liviu Dudau <[email protected]>
---
 drivers/pci/pcie/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/pcie/Kconfig +0 -0
index 6c8bc58..4cccd8c 100644

drivers/pci/pcie/Kconfig endchoice · line 85

Quoted 5 lines
drivers/pci/pcie/Kconfig +1 -1
@@ -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 <[email protected]>
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 <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>
drivers/pci/pcie/Kconfig +1 -1
index fde4a32..569f82f 100644
@@ -82,4 +82,4 @@ endchoice
 
 config PCIE_PME
 	def_bool y
-	depends on PCIEPORTBUS && PM_RUNTIME && ACPI
+	depends on PCIEPORTBUS && PM_RUNTIME
drivers/pci/pcie/pme.c +0 -0
index 9ca0dc9..795db1f 100644

drivers/pci/pcie/pme.c

Quoted 9 lines
drivers/pci/pcie/pme.c +0 -3
@@ -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

Quoted 4 lines

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

Acked-by
#3 lore raw
In reply to Bjorn Helgaas
Quoted 26 lines · Bjorn Helgaas
Quoted 11 lines · Andrew Murray
Signed-off-by Andrew Murray <[email protected]>
Signed-off-by Liviu Dudau <[email protected]>
---
 drivers/pci/pcie/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/pcie/Kconfig +0 -0
index 6c8bc58..4cccd8c 100644

drivers/pci/pcie/Kconfig endchoice · line 85

Quoted 5 lines
drivers/pci/pcie/Kconfig +1 -1
@@ -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 <[email protected]>
Date:   Thu Apr 11 17:36:50 2013 -0600
Quoted 7 lines

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 <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>
Acked-by Rafael J. Wysocki <[email protected]>
Quoted 27 lines
drivers/pci/pcie/Kconfig +1 -1
index fde4a32..569f82f 100644
@@ -82,4 +82,4 @@ endchoice
 
 config PCIE_PME
 	def_bool y
-	depends on PCIEPORTBUS && PM_RUNTIME && ACPI
+	depends on PCIEPORTBUS && PM_RUNTIME
drivers/pci/pcie/pme.c +0 -3
index 9ca0dc9..795db1f 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
maintainer Applied
#4 lore raw
Quoted 29 lines · Rafael J. Wysocki
Quoted 28 lines · Bjorn Helgaas
Quoted 11 lines · Andrew Murray
Signed-off-by Andrew Murray <[email protected]>
Signed-off-by Liviu Dudau <[email protected]>
---
 drivers/pci/pcie/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/pcie/Kconfig +0 -0
index 6c8bc58..4cccd8c 100644

drivers/pci/pcie/Kconfig endchoice · line 85

Quoted 5 lines
drivers/pci/pcie/Kconfig +1 -1
@@ -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 <[email protected]>
Date:   Thu Apr 11 17:36:50 2013 -0600

PCI: Remove unnecessary dependencies between PME and ACPI

Quoted 7 lines
Quoted 5 lines

PCIe PME doesn't depend on ACPI, so remove the #includes and Kconfig dependency.

Based-on-patch-by Andrew Murray <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>
Acked-by Rafael J. Wysocki <[email protected]>

I applied this for v3.10, thanks!

Bjorn

Quoted 30 lines
Quoted 24 lines
drivers/pci/pcie/Kconfig +1 -1
index fde4a32..569f82f 100644
@@ -82,4 +82,4 @@ endchoice
 
 config PCIE_PME
      def_bool y
-     depends on PCIEPORTBUS && PM_RUNTIME && ACPI
+     depends on PCIEPORTBUS && PM_RUNTIME
drivers/pci/pcie/pme.c +0 -3
index 9ca0dc9..795db1f 100644
@@ -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"
--
Quoted 3 lines

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

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