OSDN Git Service

mmc: sdhci-pci: Stop calling sdhci_enable_irq_wakeups()
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 9 Jan 2018 07:52:18 +0000 (09:52 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 17 Jan 2018 11:30:43 +0000 (12:30 +0100)
commit5c3c6126b62d29f539a8712c65c58afc9c9d2c91
treee4331c5f0021b0c41720836206ed9bf73e6185a4
parent84362d79f436f12d1d9b9640a633de1b684a2609
mmc: sdhci-pci: Stop calling sdhci_enable_irq_wakeups()

sdhci_enable_irq_wakeups() is already called by sdhci_suspend_host() so
sdhci-pci should not need to call it. However sdhci_suspend_host() only
calls it if wakeups are enabled, and sdhci-pci does not enable them until
after calling sdhci_suspend_host(). So move the calls to
sdhci_pci_init_wakeup() before calling sdhci_suspend_host(), and
stop calling sdhci_enable_irq_wakeups(). That results in some
simplification because sdhci_pci_suspend_host() and
__sdhci_pci_suspend_host() no longer need to be separate functions.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-pci-core.c