Merge branch 'pm-runtime'
* pm-runtime: power / PM: Eliminate CONFIG_PM_RUNTIME NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c PM: Remove the SET_PM_RUNTIME_PM_OPS() macro mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro PM / Kconfig: Replace PM_RUNTIME with PM in dependencies ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
This commit is contained in:
commit
035f10ee4e
|
@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu)
|
|||
armpmu->stop(armpmu);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int armpmu_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct arm_pmu_platdata *plat = dev_get_platdata(dev);
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <linux/pm_clock.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int davinci_pm_runtime_suspend(struct device *dev)
|
||||
{
|
||||
int ret;
|
||||
|
|
|
@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS
|
|||
select HAVE_S3C_RTC if RTC_CLASS
|
||||
select PINCTRL
|
||||
select PINCTRL_EXYNOS
|
||||
select PM_GENERIC_DOMAINS if PM_RUNTIME
|
||||
select PM_GENERIC_DOMAINS if PM
|
||||
select S5P_DEV_MFC
|
||||
select SRAM
|
||||
select MFD_SYSCON
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/clk-provider.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int keystone_pm_runtime_suspend(struct device *dev)
|
||||
{
|
||||
int ret;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "soc.h"
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int omap1_pm_runtime_suspend(struct device *dev)
|
||||
{
|
||||
int ret;
|
||||
|
@ -59,7 +59,7 @@ static struct dev_pm_domain default_pm_domain = {
|
|||
#define OMAP1_PM_DOMAIN (&default_pm_domain)
|
||||
#else
|
||||
#define OMAP1_PM_DOMAIN NULL
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static struct pm_clk_notifier_block platform_bus_notifier = {
|
||||
.pm_domain = OMAP1_PM_DOMAIN,
|
||||
|
|
|
@ -361,7 +361,7 @@ static void __init omap_hwmod_init_postsetup(void)
|
|||
u8 postsetup_state;
|
||||
|
||||
/* Set the default postsetup state for all hwmods */
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
postsetup_state = _HWMOD_STATE_IDLE;
|
||||
#else
|
||||
postsetup_state = _HWMOD_STATE_ENABLED;
|
||||
|
|
|
@ -588,7 +588,7 @@ odbs_exit:
|
|||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int _od_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
|
|
|
@ -232,7 +232,7 @@ config IA64_SGI_UV
|
|||
config IA64_HP_SIM
|
||||
bool "Ski-simulator"
|
||||
select SWIOTLB
|
||||
depends on !PM_RUNTIME
|
||||
depends on !PM
|
||||
|
||||
endchoice
|
||||
|
||||
|
|
|
@ -3968,7 +3968,7 @@ bool mp_should_keep_irq(struct device *dev)
|
|||
{
|
||||
if (dev->power.is_prepared)
|
||||
return true;
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
if (dev->power.runtime_status == RPM_SUSPENDING)
|
||||
return true;
|
||||
#endif
|
||||
|
|
|
@ -61,7 +61,7 @@ config ATA_ACPI
|
|||
|
||||
config SATA_ZPODD
|
||||
bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
|
||||
depends on ATA_ACPI && PM_RUNTIME
|
||||
depends on ATA_ACPI && PM
|
||||
default n
|
||||
help
|
||||
This option adds support for SATA Zero Power Optical Disc
|
||||
|
|
|
@ -112,7 +112,7 @@ config VIDEO_OMAP3_DEBUG
|
|||
config VIDEO_S3C_CAMIF
|
||||
tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
|
||||
depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
|
||||
depends on PM_RUNTIME
|
||||
depends on PM
|
||||
depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
|
||||
depends on HAS_DMA
|
||||
select VIDEOBUF2_DMA_CONTIG
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
config VIDEO_SAMSUNG_S5P_TV
|
||||
bool "Samsung TV driver for S5P platform"
|
||||
depends on PM_RUNTIME
|
||||
depends on PM
|
||||
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
|
||||
default n
|
||||
---help---
|
||||
|
|
|
@ -2561,7 +2561,7 @@ static int atmci_runtime_resume(struct device *dev)
|
|||
static const struct dev_pm_ops atmci_dev_pm_ops = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
|
||||
pm_runtime_force_resume)
|
||||
SET_PM_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
|
||||
SET_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
|
||||
};
|
||||
|
||||
static struct platform_driver atmci_driver = {
|
||||
|
|
|
@ -2154,7 +2154,7 @@ static int trf7970a_resume(struct device *dev)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int trf7970a_pm_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct spi_device *spi = container_of(dev, struct spi_device, dev);
|
||||
|
|
|
@ -322,7 +322,7 @@ static int omap_usb2_remove(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
static int omap_usb2_runtime_suspend(struct device *dev)
|
||||
{
|
||||
|
|
|
@ -423,7 +423,7 @@ static int ti_pipe3_remove(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
static int ti_pipe3_runtime_suspend(struct device *dev)
|
||||
{
|
||||
|
|
|
@ -951,8 +951,6 @@ static int pm2xxx_wall_charger_suspend(struct device *dev)
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
|
||||
static int pm2xxx_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
|
||||
|
@ -977,8 +975,6 @@ static int pm2xxx_runtime_resume(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static const struct dev_pm_ops pm2xxx_pm_ops = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(pm2xxx_wall_charger_suspend,
|
||||
pm2xxx_wall_charger_resume)
|
||||
|
|
|
@ -213,8 +213,6 @@ static int scsi_bus_restore(struct device *dev)
|
|||
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
|
||||
static int sdev_runtime_suspend(struct device *dev)
|
||||
{
|
||||
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
|
||||
|
@ -332,14 +330,6 @@ void scsi_autopm_put_host(struct Scsi_Host *shost)
|
|||
pm_runtime_put_sync(&shost->shost_gendev);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#define scsi_runtime_suspend NULL
|
||||
#define scsi_runtime_resume NULL
|
||||
#define scsi_runtime_idle NULL
|
||||
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
|
||||
const struct dev_pm_ops scsi_bus_pm_ops = {
|
||||
.prepare = scsi_bus_prepare,
|
||||
.suspend = scsi_bus_suspend,
|
||||
|
|
|
@ -155,8 +155,7 @@ static inline void scsi_netlink_exit(void) {}
|
|||
/* scsi_pm.c */
|
||||
#ifdef CONFIG_PM
|
||||
extern const struct dev_pm_ops scsi_bus_pm_ops;
|
||||
#endif
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
|
||||
extern void scsi_autopm_get_target(struct scsi_target *);
|
||||
extern void scsi_autopm_put_target(struct scsi_target *);
|
||||
extern int scsi_autopm_get_host(struct Scsi_Host *);
|
||||
|
@ -166,7 +165,7 @@ static inline void scsi_autopm_get_target(struct scsi_target *t) {}
|
|||
static inline void scsi_autopm_put_target(struct scsi_target *t) {}
|
||||
static inline int scsi_autopm_get_host(struct Scsi_Host *h) { return 0; }
|
||||
static inline void scsi_autopm_put_host(struct Scsi_Host *h) {}
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
extern struct async_domain scsi_sd_pm_domain;
|
||||
extern struct async_domain scsi_sd_probe_domain;
|
||||
|
|
|
@ -62,12 +62,7 @@ static int ufshcd_pci_resume(struct device *dev)
|
|||
{
|
||||
return ufshcd_system_resume(dev_get_drvdata(dev));
|
||||
}
|
||||
#else
|
||||
#define ufshcd_pci_suspend NULL
|
||||
#define ufshcd_pci_resume NULL
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
static int ufshcd_pci_runtime_suspend(struct device *dev)
|
||||
{
|
||||
return ufshcd_runtime_suspend(dev_get_drvdata(dev));
|
||||
|
@ -80,11 +75,13 @@ static int ufshcd_pci_runtime_idle(struct device *dev)
|
|||
{
|
||||
return ufshcd_runtime_idle(dev_get_drvdata(dev));
|
||||
}
|
||||
#else /* !CONFIG_PM_RUNTIME */
|
||||
#else /* !CONFIG_PM */
|
||||
#define ufshcd_pci_suspend NULL
|
||||
#define ufshcd_pci_resume NULL
|
||||
#define ufshcd_pci_runtime_suspend NULL
|
||||
#define ufshcd_pci_runtime_resume NULL
|
||||
#define ufshcd_pci_runtime_idle NULL
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
/**
|
||||
* ufshcd_pci_shutdown - main function to put the controller in reset state
|
||||
|
|
|
@ -261,12 +261,7 @@ static int ufshcd_pltfrm_resume(struct device *dev)
|
|||
{
|
||||
return ufshcd_system_resume(dev_get_drvdata(dev));
|
||||
}
|
||||
#else
|
||||
#define ufshcd_pltfrm_suspend NULL
|
||||
#define ufshcd_pltfrm_resume NULL
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
static int ufshcd_pltfrm_runtime_suspend(struct device *dev)
|
||||
{
|
||||
return ufshcd_runtime_suspend(dev_get_drvdata(dev));
|
||||
|
@ -279,11 +274,13 @@ static int ufshcd_pltfrm_runtime_idle(struct device *dev)
|
|||
{
|
||||
return ufshcd_runtime_idle(dev_get_drvdata(dev));
|
||||
}
|
||||
#else /* !CONFIG_PM_RUNTIME */
|
||||
#else /* !CONFIG_PM */
|
||||
#define ufshcd_pltfrm_suspend NULL
|
||||
#define ufshcd_pltfrm_resume NULL
|
||||
#define ufshcd_pltfrm_runtime_suspend NULL
|
||||
#define ufshcd_pltfrm_runtime_resume NULL
|
||||
#define ufshcd_pltfrm_runtime_idle NULL
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static void ufshcd_pltfrm_shutdown(struct platform_device *pdev)
|
||||
{
|
||||
|
|
|
@ -491,7 +491,7 @@ static int mcfqspi_resume(struct device *dev)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int mcfqspi_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
|
|
|
@ -523,7 +523,7 @@ static int orion_spi_remove(struct platform_device *pdev)
|
|||
|
||||
MODULE_ALIAS("platform:" DRIVER_NAME);
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int orion_spi_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
|
|
|
@ -1307,7 +1307,7 @@ static int pxa2xx_spi_resume(struct device *dev)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int pxa2xx_spi_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct driver_data *drv_data = dev_get_drvdata(dev);
|
||||
|
|
|
@ -646,7 +646,7 @@ error:
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int spi_qup_pm_suspend_runtime(struct device *device)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(device);
|
||||
|
@ -672,7 +672,7 @@ static int spi_qup_pm_resume_runtime(struct device *device)
|
|||
writel_relaxed(config, controller->base + QUP_CONFIG);
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int spi_qup_suspend(struct device *device)
|
||||
|
|
|
@ -801,7 +801,7 @@ static int rockchip_spi_resume(struct device *dev)
|
|||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int rockchip_spi_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
|
@ -829,7 +829,7 @@ static int rockchip_spi_runtime_resume(struct device *dev)
|
|||
|
||||
return ret;
|
||||
}
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static const struct dev_pm_ops rockchip_spi_pm = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(rockchip_spi_suspend, rockchip_spi_resume)
|
||||
|
|
|
@ -1266,7 +1266,7 @@ static int s3c64xx_spi_resume(struct device *dev)
|
|||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int s3c64xx_spi_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
|
@ -1296,7 +1296,7 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static const struct dev_pm_ops s3c64xx_spi_pm = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(s3c64xx_spi_suspend, s3c64xx_spi_resume)
|
||||
|
|
|
@ -53,7 +53,7 @@ if WIMAX_GDM72XX_USB
|
|||
|
||||
config WIMAX_GDM72XX_USB_PM
|
||||
bool "Enable power management support"
|
||||
depends on PM_RUNTIME
|
||||
depends on PM
|
||||
help
|
||||
Enable USB power management in order to reduce power consumption
|
||||
while the interface is not in use.
|
||||
|
|
|
@ -489,7 +489,7 @@ static int dw8250_resume(struct device *dev)
|
|||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int dw8250_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct dw8250_data *data = dev_get_drvdata(dev);
|
||||
|
|
|
@ -244,7 +244,7 @@ static int mtk8250_resume(struct device *dev)
|
|||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int mtk8250_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct mtk8250_data *data = dev_get_drvdata(dev);
|
||||
|
|
|
@ -1252,12 +1252,7 @@ static int serial_hsu_resume(struct pci_dev *pdev)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
#define serial_hsu_suspend NULL
|
||||
#define serial_hsu_resume NULL
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
static int serial_hsu_runtime_idle(struct device *dev)
|
||||
{
|
||||
pm_schedule_suspend(dev, 500);
|
||||
|
@ -1274,6 +1269,8 @@ static int serial_hsu_runtime_resume(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
#else
|
||||
#define serial_hsu_suspend NULL
|
||||
#define serial_hsu_resume NULL
|
||||
#define serial_hsu_runtime_idle NULL
|
||||
#define serial_hsu_runtime_suspend NULL
|
||||
#define serial_hsu_runtime_resume NULL
|
||||
|
|
|
@ -1792,7 +1792,7 @@ static void __exit msm_serial_hs_exit(void)
|
|||
}
|
||||
module_exit(msm_serial_hs_exit);
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int msm_hs_runtime_idle(struct device *dev)
|
||||
{
|
||||
/*
|
||||
|
|
|
@ -1799,7 +1799,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static void serial_omap_restore_context(struct uart_omap_port *up)
|
||||
{
|
||||
if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
|
||||
|
|
|
@ -43,7 +43,7 @@ config USB_DYNAMIC_MINORS
|
|||
|
||||
config USB_OTG
|
||||
bool "OTG support"
|
||||
depends on PM_RUNTIME
|
||||
depends on PM
|
||||
default n
|
||||
help
|
||||
The most notable feature of USB OTG is support for a
|
||||
|
|
|
@ -20,7 +20,7 @@ config AB8500_USB
|
|||
|
||||
config FSL_USB2_OTG
|
||||
bool "Freescale USB OTG Transceiver Driver"
|
||||
depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM_RUNTIME
|
||||
depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM
|
||||
select USB_OTG
|
||||
select USB_PHY
|
||||
help
|
||||
|
@ -153,7 +153,7 @@ config USB_MSM_OTG
|
|||
|
||||
config USB_MV_OTG
|
||||
tristate "Marvell USB OTG support"
|
||||
depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME
|
||||
depends on USB_EHCI_MV && USB_MV_UDC && PM
|
||||
select USB_OTG
|
||||
select USB_PHY
|
||||
help
|
||||
|
|
|
@ -41,7 +41,7 @@ config USB_STORAGE_REALTEK
|
|||
|
||||
config REALTEK_AUTOPM
|
||||
bool "Realtek Card Reader autosuspend support"
|
||||
depends on USB_STORAGE_REALTEK && PM_RUNTIME
|
||||
depends on USB_STORAGE_REALTEK && PM
|
||||
default y
|
||||
|
||||
config USB_STORAGE_DATAFAB
|
||||
|
|
|
@ -1630,7 +1630,7 @@ static int s3c_fb_resume(struct device *dev)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int s3c_fb_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct s3c_fb *sfb = dev_get_drvdata(dev);
|
||||
|
|
|
@ -569,7 +569,7 @@ EXPORT_SYMBOL_GPL(sh_mobile_meram_cache_update);
|
|||
* Power management
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME)
|
||||
#ifdef CONFIG_PM
|
||||
static int sh_mobile_meram_suspend(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
|
@ -612,7 +612,7 @@ static int sh_mobile_meram_resume(struct device *dev)
|
|||
meram_write_reg(priv->base, common_regs[i], priv->regs[i]);
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static UNIVERSAL_DEV_PM_OPS(sh_mobile_meram_dev_pm_ops,
|
||||
sh_mobile_meram_suspend,
|
||||
|
|
|
@ -351,8 +351,6 @@ struct dev_pm_ops {
|
|||
#define SET_RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn)
|
||||
#endif
|
||||
|
||||
#define SET_PM_RUNTIME_PM_OPS SET_RUNTIME_PM_OPS
|
||||
|
||||
/*
|
||||
* Use this if you want to use the same suspend and resume callbacks for suspend
|
||||
* to RAM and hibernation.
|
||||
|
|
|
@ -441,13 +441,13 @@ static inline int scsi_execute_req(struct scsi_device *sdev,
|
|||
extern void sdev_disable_disk_events(struct scsi_device *sdev);
|
||||
extern void sdev_enable_disk_events(struct scsi_device *sdev);
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
extern int scsi_autopm_get_device(struct scsi_device *);
|
||||
extern void scsi_autopm_put_device(struct scsi_device *);
|
||||
#else
|
||||
static inline int scsi_autopm_get_device(struct scsi_device *d) { return 0; }
|
||||
static inline void scsi_autopm_put_device(struct scsi_device *d) {}
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
|
||||
{
|
||||
|
|
|
@ -55,7 +55,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
|
|||
obj-$(CONFIG_EVENT_TRACING) += trace_events_trigger.o
|
||||
obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
|
||||
obj-$(CONFIG_TRACEPOINTS) += power-traces.o
|
||||
ifeq ($(CONFIG_PM_RUNTIME),y)
|
||||
ifeq ($(CONFIG_PM),y)
|
||||
obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
|
||||
endif
|
||||
ifeq ($(CONFIG_TRACING),y)
|
||||
|
|
|
@ -1676,7 +1676,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)
|
|||
u8 sd_status;
|
||||
int i;
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
|
||||
if (!pm_runtime_active(chip->card->dev))
|
||||
return IRQ_NONE;
|
||||
|
|
|
@ -857,7 +857,7 @@ static int azx_resume(struct device *dev)
|
|||
}
|
||||
#endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int azx_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct snd_card *card = dev_get_drvdata(dev);
|
||||
|
@ -955,9 +955,6 @@ static int azx_runtime_idle(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static const struct dev_pm_ops azx_pm = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume)
|
||||
SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle)
|
||||
|
|
|
@ -550,7 +550,7 @@ static int cs35l32_i2c_remove(struct i2c_client *i2c_client)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int cs35l32_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct cs35l32_private *cs35l32 = dev_get_drvdata(dev);
|
||||
|
|
|
@ -537,7 +537,7 @@ err_enable:
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(cs42xx8_probe);
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int cs42xx8_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct cs42xx8_priv *cs42xx8 = dev_get_drvdata(dev);
|
||||
|
|
|
@ -2492,7 +2492,7 @@ static int max98090_i2c_remove(struct i2c_client *client)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int max98090_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct max98090_priv *max98090 = dev_get_drvdata(dev);
|
||||
|
|
|
@ -517,7 +517,7 @@ void pcm512x_remove(struct device *dev)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(pcm512x_remove);
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int pcm512x_suspend(struct device *dev)
|
||||
{
|
||||
struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
|
||||
|
|
|
@ -115,7 +115,7 @@ static const struct snd_soc_dapm_route tas2552_audio_map[] = {
|
|||
{"ClassD", NULL, "PLL"},
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static void tas2552_sw_shutdown(struct tas2552_data *tas_data, int sw_shutdown)
|
||||
{
|
||||
u8 cfg1_reg;
|
||||
|
@ -264,7 +264,7 @@ static int tas2552_mute(struct snd_soc_dai *dai, int mute)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int tas2552_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct tas2552_data *tas2552 = dev_get_drvdata(dev);
|
||||
|
|
|
@ -2440,7 +2440,7 @@ static int wm2200_i2c_remove(struct i2c_client *i2c)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int wm2200_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct wm2200_priv *wm2200 = dev_get_drvdata(dev);
|
||||
|
|
|
@ -2664,7 +2664,7 @@ static int wm5100_i2c_remove(struct i2c_client *i2c)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int wm5100_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct wm5100_priv *wm5100 = dev_get_drvdata(dev);
|
||||
|
|
|
@ -3782,7 +3782,7 @@ static int wm8962_i2c_remove(struct i2c_client *client)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int wm8962_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct wm8962_priv *wm8962 = dev_get_drvdata(dev);
|
||||
|
|
|
@ -928,7 +928,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int fsl_asrc_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct fsl_asrc *asrc_priv = dev_get_drvdata(dev);
|
||||
|
@ -954,7 +954,7 @@ static int fsl_asrc_runtime_suspend(struct device *dev)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int fsl_asrc_suspend(struct device *dev)
|
||||
|
|
|
@ -1113,7 +1113,7 @@ static inline const struct samsung_i2s_dai_data *samsung_i2s_get_driver_data(
|
|||
platform_get_device_id(pdev)->driver_data;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
#ifdef CONFIG_PM
|
||||
static int i2s_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct i2s_dai *i2s = dev_get_drvdata(dev);
|
||||
|
@ -1131,7 +1131,7 @@ static int i2s_runtime_resume(struct device *dev)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PM_RUNTIME */
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static int samsung_i2s_probe(struct platform_device *pdev)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue