Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbb988be authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PCI / PM: Drop CONFIG_PM_RUNTIME from the PCI core 



After commit b2b49ccb (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so quite a few
depend on CONFIG_PM.

Replace CONFIG_PM_RUNTIME with CONFIG_PM in the PCI core code.

Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5de21bb9

drivers/pci/pci-driver.c

+7 −13
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ static int pci_pm_restore(struct device *dev) 


#endif /* !CONFIG_HIBERNATE_CALLBACKS */



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM



static int pci_pm_runtime_suspend(struct device *dev)

{
@@ -1200,16 +1200,6 @@ static int pci_pm_runtime_idle(struct device *dev) 
	return ret;

}



#else /* !CONFIG_PM_RUNTIME */



#define pci_pm_runtime_suspend	NULL

#define pci_pm_runtime_resume	NULL

#define pci_pm_runtime_idle	NULL



#endif /* !CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM



static const struct dev_pm_ops pci_dev_pm_ops = {

	.prepare = pci_pm_prepare,

	.suspend = pci_pm_suspend,
@@ -1231,11 +1221,15 @@ static const struct dev_pm_ops pci_dev_pm_ops = { 


#define PCI_PM_OPS_PTR	(&pci_dev_pm_ops)



#else /* !COMFIG_PM_OPS */

#else /* !CONFIG_PM */



#define pci_pm_runtime_suspend	NULL

#define pci_pm_runtime_resume	NULL

#define pci_pm_runtime_idle	NULL



#define PCI_PM_OPS_PTR	NULL



#endif /* !COMFIG_PM_OPS */

#endif /* !CONFIG_PM */



/**

 * __pci_register_driver - register a new pci driver

drivers/pci/pci-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static ssize_t dev_bus_rescan_store(struct device *dev, 
}

static DEVICE_ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store);



#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)

#if defined(CONFIG_PM) && defined(CONFIG_ACPI)

static ssize_t d3cold_allowed_store(struct device *dev,

				    struct device_attribute *attr,

				    const char *buf, size_t count)
@@ -566,7 +566,7 @@ static struct attribute *pci_dev_attrs[] = { 
	&dev_attr_enable.attr,

	&dev_attr_broken_parity_status.attr,

	&dev_attr_msi_bus.attr,

#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)

#if defined(CONFIG_PM) && defined(CONFIG_ACPI)

	&dev_attr_d3cold_allowed.attr,

#endif

#ifdef CONFIG_OF

drivers/pci/pcie/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -79,4 +79,4 @@ endchoice 


config PCIE_PME

	def_bool y

	depends on PCIEPORTBUS && PM_RUNTIME
 
	depends on PCIEPORTBUS && PM