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

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

mmc: sdhci-pci: Conditionally compile pm sleep functions 



It is confusing to have some parts of suspend / resume under conditional
compilation and some parts not. Use conditional compilation everywhere.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
parent 1cb0a58e

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

+10 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static int ricoh_mmc_probe_slot(struct sdhci_pci_slot *slot) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int ricoh_mmc_resume(struct sdhci_pci_chip *chip)

{

	/* Apply a delay to allow controller to settle */
@@ -75,6 +76,7 @@ static int ricoh_mmc_resume(struct sdhci_pci_chip *chip) 
	msleep(500);

	return 0;

}

#endif



static const struct sdhci_pci_fixes sdhci_ricoh = {

	.probe		= ricoh_probe,
@@ -85,7 +87,9 @@ static const struct sdhci_pci_fixes sdhci_ricoh = { 


static const struct sdhci_pci_fixes sdhci_ricoh_mmc = {

	.probe_slot	= ricoh_mmc_probe_slot,

#ifdef CONFIG_PM_SLEEP

	.resume		= ricoh_mmc_resume,

#endif

	.quirks		= SDHCI_QUIRK_32BIT_DMA_ADDR |

			  SDHCI_QUIRK_CLOCK_BEFORE_RESET |

			  SDHCI_QUIRK_NO_CARD_NO_RESET |
@@ -751,6 +755,7 @@ static void jmicron_remove_slot(struct sdhci_pci_slot *slot, int dead) 
		jmicron_enable_mmc(slot->host, 0);

}



#ifdef CONFIG_PM_SLEEP

static int jmicron_suspend(struct sdhci_pci_chip *chip)

{

	int i;
@@ -782,13 +787,16 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) 


	return 0;

}

#endif



static const struct sdhci_pci_fixes sdhci_o2 = {

	.probe = sdhci_pci_o2_probe,

	.quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,

	.quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD,

	.probe_slot = sdhci_pci_o2_probe_slot,

#ifdef CONFIG_PM_SLEEP

	.resume = sdhci_pci_o2_resume,

#endif

};



static const struct sdhci_pci_fixes sdhci_jmicron = {
@@ -797,8 +805,10 @@ static const struct sdhci_pci_fixes sdhci_jmicron = { 
	.probe_slot	= jmicron_probe_slot,

	.remove_slot	= jmicron_remove_slot,



#ifdef CONFIG_PM_SLEEP

	.suspend	= jmicron_suspend,

	.resume		= jmicron_resume,

#endif

};



/* SysKonnect CardBus2SDIO extra registers */

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

+2 −0
Original line number Diff line number Diff line
@@ -384,8 +384,10 @@ int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

int sdhci_pci_o2_resume(struct sdhci_pci_chip *chip)

{

	sdhci_pci_o2_probe(chip);

	return 0;

}

#endif

drivers/mmc/host/sdhci-pci.h

+2 −0
Original line number Diff line number Diff line
@@ -67,8 +67,10 @@ struct sdhci_pci_fixes { 
	int			(*add_host) (struct sdhci_pci_slot *);

	void			(*remove_slot) (struct sdhci_pci_slot *, int);



#ifdef CONFIG_PM_SLEEP

	int			(*suspend) (struct sdhci_pci_chip *);

	int			(*resume) (struct sdhci_pci_chip *);

#endif



	const struct sdhci_ops	*ops;

	size_t			priv_size;