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

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

ACPI / PM: Drop CONFIG_PM_RUNTIME from the ACPI 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 ACPI core code.

Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 4bea2b4c

drivers/acpi/acpi_lpss.c

+1 −3
Original line number Diff line number Diff line
@@ -588,7 +588,6 @@ static int acpi_lpss_resume_early(struct device *dev) 
}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_RUNTIME

static int acpi_lpss_runtime_suspend(struct device *dev)

{

	struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
@@ -631,11 +630,11 @@ static int acpi_lpss_runtime_resume(struct device *dev) 


	return pm_generic_runtime_resume(dev);

}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static struct dev_pm_domain acpi_lpss_pm_domain = {

	.ops = {

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

		.prepare = acpi_subsys_prepare,

		.complete = acpi_subsys_complete,
@@ -647,7 +646,6 @@ static struct dev_pm_domain acpi_lpss_pm_domain = { 
		.poweroff_late = acpi_lpss_suspend_late,

		.restore_early = acpi_lpss_resume_early,

#endif

#ifdef CONFIG_PM_RUNTIME

		.runtime_suspend = acpi_lpss_runtime_suspend,

		.runtime_resume = acpi_lpss_runtime_resume,

#endif

drivers/acpi/device_pm.c

+2 −6
Original line number Diff line number Diff line
@@ -692,7 +692,6 @@ static int acpi_device_wakeup(struct acpi_device *adev, u32 target_state, 
	return 0;

}



#ifdef CONFIG_PM_RUNTIME

/**

 * acpi_pm_device_run_wake - Enable/disable remote wakeup for given device.

 * @dev: Device to enable/disable the platform to wake up.
@@ -714,7 +713,6 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable) 
	return acpi_device_wakeup(adev, ACPI_STATE_S0, enable);

}

EXPORT_SYMBOL(acpi_pm_device_run_wake);

#endif /* CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM_SLEEP

/**
@@ -773,7 +771,6 @@ static int acpi_dev_pm_full_power(struct acpi_device *adev) 
		acpi_device_set_power(adev, ACPI_STATE_D0) : 0;

}



#ifdef CONFIG_PM_RUNTIME

/**

 * acpi_dev_runtime_suspend - Put device into a low-power state using ACPI.

 * @dev: Device to put into a low-power state.
@@ -855,7 +852,6 @@ int acpi_subsys_runtime_resume(struct device *dev) 
	return ret ? ret : pm_generic_runtime_resume(dev);

}

EXPORT_SYMBOL_GPL(acpi_subsys_runtime_resume);

#endif /* CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM_SLEEP

/**
@@ -1023,10 +1019,9 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze); 


static struct dev_pm_domain acpi_general_pm_domain = {

	.ops = {

#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

		.runtime_suspend = acpi_subsys_runtime_suspend,

		.runtime_resume = acpi_subsys_runtime_resume,

#endif

#ifdef CONFIG_PM_SLEEP

		.prepare = acpi_subsys_prepare,

		.complete = acpi_subsys_complete,
@@ -1037,6 +1032,7 @@ static struct dev_pm_domain acpi_general_pm_domain = { 
		.poweroff = acpi_subsys_suspend,

		.poweroff_late = acpi_subsys_suspend_late,

		.restore_early = acpi_subsys_resume_early,

#endif

#endif

	},

};

drivers/acpi/pci_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev) 
	/* Keep IOAPIC pin configuration when suspending */

	if (dev->dev.power.is_prepared)

		return;

#ifdef	CONFIG_PM_RUNTIME

#ifdef	CONFIG_PM

	if (dev->dev.power.runtime_status == RPM_SUSPENDING)

		return;

#endif

include/acpi/acpi_bus.h

+1 −5
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev, struct device *dev, 
				 void (*work_func)(struct work_struct *work));

acpi_status acpi_remove_pm_notifier(struct acpi_device *adev);

int acpi_pm_device_sleep_state(struct device *, int *, int);

int acpi_pm_device_run_wake(struct device *, bool);

#else

static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev,

					       struct device *dev,
@@ -535,11 +536,6 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) 
	return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ?

		m : ACPI_STATE_D0;

}

#endif



#ifdef CONFIG_PM_RUNTIME

int acpi_pm_device_run_wake(struct device *, bool);

#else

static inline int acpi_pm_device_run_wake(struct device *dev, bool enable)

{

	return -ENODEV;

include/linux/acpi.h

+11 −15
Original line number Diff line number Diff line
@@ -553,16 +553,26 @@ static inline void arch_reserve_mem_area(acpi_physical_address addr, 
#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0)

#endif



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

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

int acpi_dev_runtime_suspend(struct device *dev);

int acpi_dev_runtime_resume(struct device *dev);

int acpi_subsys_runtime_suspend(struct device *dev);

int acpi_subsys_runtime_resume(struct device *dev);

struct acpi_device *acpi_dev_pm_get_node(struct device *dev);

int acpi_dev_pm_attach(struct device *dev, bool power_on);

#else

static inline int acpi_dev_runtime_suspend(struct device *dev) { return 0; }

static inline int acpi_dev_runtime_resume(struct device *dev) { return 0; }

static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; }

static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }

static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev)

{

	return NULL;

}

static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)

{

	return -ENODEV;

}

#endif



#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
@@ -585,20 +595,6 @@ static inline int acpi_subsys_suspend(struct device *dev) { return 0; } 
static inline int acpi_subsys_freeze(struct device *dev) { return 0; }

#endif



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

struct acpi_device *acpi_dev_pm_get_node(struct device *dev);

int acpi_dev_pm_attach(struct device *dev, bool power_on);

#else

static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev)

{

	return NULL;

}

static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)

{

	return -ENODEV;

}

#endif



#ifdef CONFIG_ACPI

__printf(3, 4)

void acpi_handle_printk(const char *level, acpi_handle handle,