Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02d0b685 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: sdhci: Move sdhci_runtime_pm_bus_off|on() to avoid pre-definition 



There are no need to have two versions of sdhci_runtime_pm_bus_off|on(),
depending on whether CONFIG_PM is set or unset. Thus it's easy to move the
implementation of these functions a bit earlier to avoid the unnecessary
pre-definition of them, so let's do that.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
parent dc4c90fa

drivers/mmc/host/sdhci.c

+16 −28
Original line number Original line Diff line number Diff line
@@ -55,18 +55,6 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode); 
static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable);

static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable);

static int sdhci_do_get_cd(struct sdhci_host *host);

static int sdhci_do_get_cd(struct sdhci_host *host);





#ifdef CONFIG_PM

static void sdhci_runtime_pm_bus_on(struct sdhci_host *host);

static void sdhci_runtime_pm_bus_off(struct sdhci_host *host);

#else

static void sdhci_runtime_pm_bus_on(struct sdhci_host *host)

{

}

static void sdhci_runtime_pm_bus_off(struct sdhci_host *host)

{

}

#endif



static void sdhci_dumpregs(struct sdhci_host *host)

static void sdhci_dumpregs(struct sdhci_host *host)

{

{

	pr_debug(DRIVER_NAME ": =========== REGISTER DUMP (%s)===========\n",

	pr_debug(DRIVER_NAME ": =========== REGISTER DUMP (%s)===========\n",
@@ -161,6 +149,22 @@ static void sdhci_disable_card_detection(struct sdhci_host *host) 
	sdhci_set_card_detection(host, false);

	sdhci_set_card_detection(host, false);

}

}





static void sdhci_runtime_pm_bus_on(struct sdhci_host *host)

{

	if (host->bus_on)

		return;

	host->bus_on = true;

	pm_runtime_get_noresume(host->mmc->parent);

}



static void sdhci_runtime_pm_bus_off(struct sdhci_host *host)

{

	if (!host->bus_on)

		return;

	host->bus_on = false;

	pm_runtime_put_noidle(host->mmc->parent);

}



void sdhci_reset(struct sdhci_host *host, u8 mask)

void sdhci_reset(struct sdhci_host *host, u8 mask)

{

{

	unsigned long timeout;

	unsigned long timeout;
@@ -2667,22 +2671,6 @@ int sdhci_resume_host(struct sdhci_host *host) 




EXPORT_SYMBOL_GPL(sdhci_resume_host);

EXPORT_SYMBOL_GPL(sdhci_resume_host);





static void sdhci_runtime_pm_bus_on(struct sdhci_host *host)

{

	if (host->bus_on)

		return;

	host->bus_on = true;

	pm_runtime_get_noresume(host->mmc->parent);

}



static void sdhci_runtime_pm_bus_off(struct sdhci_host *host)

{

	if (!host->bus_on)

		return;

	host->bus_on = false;

	pm_runtime_put_noidle(host->mmc->parent);

}



int sdhci_runtime_suspend_host(struct sdhci_host *host)

int sdhci_runtime_suspend_host(struct sdhci_host *host)

{

{

	unsigned long flags;

	unsigned long flags;