From: Dmitry Shmidt Date: Thu, 7 Oct 2010 21:39:16 +0000 (-0700) Subject: mmc: Add "ignore mmc pm notify" functionality X-Git-Tag: firefly_0821_release~4090^2~852 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3549af216ba41d5bd7028c56418f5beeb4976681;p=firefly-linux-kernel-4.4.55.git mmc: Add "ignore mmc pm notify" functionality Signed-off-by: Dmitry Shmidt --- diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 2a3593d9f87d..f5bb7c769c3e 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -511,7 +511,8 @@ int mmc_add_host(struct mmc_host *host) mmc_host_clk_sysfs_init(host); mmc_start_host(host); - register_pm_notifier(&host->pm_notify); + if (!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY)) + register_pm_notifier(&host->pm_notify); return 0; } @@ -528,7 +529,9 @@ EXPORT_SYMBOL(mmc_add_host); */ void mmc_remove_host(struct mmc_host *host) { - unregister_pm_notifier(&host->pm_notify); + if (!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY)) + unregister_pm_notifier(&host->pm_notify); + mmc_stop_host(host); #ifdef CONFIG_DEBUG_FS diff --git a/include/linux/mmc/pm.h b/include/linux/mmc/pm.h index 4a139204c20c..6e2d6a135c7e 100644 --- a/include/linux/mmc/pm.h +++ b/include/linux/mmc/pm.h @@ -26,5 +26,6 @@ typedef unsigned int mmc_pm_flag_t; #define MMC_PM_KEEP_POWER (1 << 0) /* preserve card power during suspend */ #define MMC_PM_WAKE_SDIO_IRQ (1 << 1) /* wake up host system on SDIO IRQ assertion */ +#define MMC_PM_IGNORE_PM_NOTIFY (1 << 2) /* ignore mmc pm notify */ #endif /* LINUX_MMC_PM_H */