Commit 5c3c6126 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

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: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 84362d79

drivers/mmc/host/sdhci-pci-core.c

+21 −37
Original line number Diff line number Diff line
@@ -38,10 +38,29 @@ 
static void sdhci_pci_hw_reset(struct sdhci_host *host);



#ifdef CONFIG_PM_SLEEP

static int __sdhci_pci_suspend_host(struct sdhci_pci_chip *chip)

static int sdhci_pci_init_wakeup(struct sdhci_pci_chip *chip)

{

	mmc_pm_flag_t pm_flags = 0;

	int i;



	for (i = 0; i < chip->num_slots; i++) {

		struct sdhci_pci_slot *slot = chip->slots[i];



		if (slot)

			pm_flags |= slot->host->mmc->pm_flags;

	}



	return device_init_wakeup(&chip->pdev->dev,

				  (pm_flags & MMC_PM_KEEP_POWER) &&

				  (pm_flags & MMC_PM_WAKE_SDIO_IRQ));

}



static int sdhci_pci_suspend_host(struct sdhci_pci_chip *chip)

{

	int i, ret;



	sdhci_pci_init_wakeup(chip);



	for (i = 0; i < chip->num_slots; i++) {

		struct sdhci_pci_slot *slot = chip->slots[i];

		struct sdhci_host *host;
@@ -57,9 +76,6 @@ static int __sdhci_pci_suspend_host(struct sdhci_pci_chip *chip) 
		ret = sdhci_suspend_host(host);

		if (ret)

			goto err_pci_suspend;



		if (host->mmc->pm_flags & MMC_PM_WAKE_SDIO_IRQ)

			sdhci_enable_irq_wakeups(host);

	}



	return 0;
@@ -70,36 +86,6 @@ err_pci_suspend: 
	return ret;

}



static int sdhci_pci_init_wakeup(struct sdhci_pci_chip *chip)

{

	mmc_pm_flag_t pm_flags = 0;

	int i;



	for (i = 0; i < chip->num_slots; i++) {

		struct sdhci_pci_slot *slot = chip->slots[i];



		if (slot)

			pm_flags |= slot->host->mmc->pm_flags;

	}



	return device_init_wakeup(&chip->pdev->dev,

				  (pm_flags & MMC_PM_KEEP_POWER) &&

				  (pm_flags & MMC_PM_WAKE_SDIO_IRQ));

}



static int sdhci_pci_suspend_host(struct sdhci_pci_chip *chip)

{

	int ret;



	ret = __sdhci_pci_suspend_host(chip);

	if (ret)

		return ret;



	sdhci_pci_init_wakeup(chip);



	return 0;

}



int sdhci_pci_resume_host(struct sdhci_pci_chip *chip)

{

	struct sdhci_pci_slot *slot;
@@ -1109,7 +1095,7 @@ static int jmicron_suspend(struct sdhci_pci_chip *chip) 
{

	int i, ret;



	ret = __sdhci_pci_suspend_host(chip);

	ret = sdhci_pci_suspend_host(chip);

	if (ret)

		return ret;
@@ -1119,8 +1105,6 @@ static int jmicron_suspend(struct sdhci_pci_chip *chip) 
			jmicron_enable_mmc(chip->slots[i]->host, 0);

	}



	sdhci_pci_init_wakeup(chip);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE