lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 19 Dec 2014 02:51:38 +0100 From: "Rafael J. Wysocki" <rjw@...ysocki.net> To: Linux PM list <linux-pm@...r.kernel.org>, Mark Brown <broonie@...nel.org> Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Ulf Hansson <ulf.hansson@...aro.org>, Kevin Hilman <khilman@...nel.org>, Liam Girdwood <lgirdwood@...il.com>, Takashi Iwai <tiwai@...e.de> Subject: [PATCH 2/4] sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM From: Rafael J. Wysocki <rafael.j.wysocki@...el.com> The sst-haswell-pcm driver is a new user of CONFIG_PM_RUNTIME. However, 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 in sound/soc/intel/sst-haswell-pcm.c. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com> --- Please let me know if there are any objections against pushing this through the linux-pm tree. --- sound/soc/intel/sst-haswell-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-pm/sound/soc/intel/sst-haswell-pcm.c =================================================================== --- linux-pm.orig/sound/soc/intel/sst-haswell-pcm.c +++ linux-pm/sound/soc/intel/sst-haswell-pcm.c @@ -998,7 +998,7 @@ static int hsw_pcm_dev_remove(struct pla return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int hsw_pcm_runtime_idle(struct device *dev) { @@ -1057,7 +1057,7 @@ static int hsw_pcm_runtime_resume(struct #define hsw_pcm_runtime_resume NULL #endif -#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_RUNTIME) +#ifdef CONFIG_PM static void hsw_pcm_complete(struct device *dev) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists