diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-12 18:42:18 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-12 18:42:18 -0500 |
commit | 641d334b29429f1d191b4bb4295f7a259b1660cc (patch) | |
tree | d5afe5355150d6e21913e57479b7c505e9135ed1 /sound/soc/fsl | |
parent | 7ba37053ebcc59e96b2677d42a2ee08b6c217d25 (diff) |
sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.
Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under sound/.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Acked-by: Brian Austin <brian.austin@cirrus.com>
Acked-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/fsl_asrc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 9deabdd2b1a2..026a80117540 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c | |||
@@ -928,7 +928,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) | |||
928 | return 0; | 928 | return 0; |
929 | } | 929 | } |
930 | 930 | ||
931 | #ifdef CONFIG_PM_RUNTIME | 931 | #ifdef CONFIG_PM |
932 | static int fsl_asrc_runtime_resume(struct device *dev) | 932 | static int fsl_asrc_runtime_resume(struct device *dev) |
933 | { | 933 | { |
934 | struct fsl_asrc *asrc_priv = dev_get_drvdata(dev); | 934 | struct fsl_asrc *asrc_priv = dev_get_drvdata(dev); |
@@ -954,7 +954,7 @@ static int fsl_asrc_runtime_suspend(struct device *dev) | |||
954 | 954 | ||
955 | return 0; | 955 | return 0; |
956 | } | 956 | } |
957 | #endif /* CONFIG_PM_RUNTIME */ | 957 | #endif /* CONFIG_PM */ |
958 | 958 | ||
959 | #ifdef CONFIG_PM_SLEEP | 959 | #ifdef CONFIG_PM_SLEEP |
960 | static int fsl_asrc_suspend(struct device *dev) | 960 | static int fsl_asrc_suspend(struct device *dev) |