Commit 50371ef0 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: Switch to SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() and pm_ptr() 



SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() require __maybe_unused
or #ifdefs protection against unused function warnings. The usage of
pm_ptr() and SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() allows the compiler to
see the functions, thus suppressing the warning. Drop the #ifdefs.

Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 15213383

drivers/mmc/host/renesas_sdhi_internal_dmac.c

+5 −6
Original line number Diff line number Diff line
@@ -600,9 +600,8 @@ static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev) 
}



static const struct dev_pm_ops renesas_sdhi_internal_dmac_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,

	SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)

	RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,

		       tmio_mmc_host_runtime_resume,

		       NULL)

};
@@ -611,7 +610,7 @@ static struct platform_driver renesas_internal_dmac_sdhi_driver = { 
	.driver		= {

		.name	= "renesas_sdhi_internal_dmac",

		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

		.pm	= &renesas_sdhi_internal_dmac_dev_pm_ops,

		.pm	= pm_ptr(&renesas_sdhi_internal_dmac_dev_pm_ops),

		.of_match_table = renesas_sdhi_internal_dmac_of_match,

	},

	.probe		= renesas_sdhi_internal_dmac_probe,

drivers/mmc/host/tmio_mmc.h

+0 −2
Original line number Diff line number Diff line
@@ -209,10 +209,8 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i); 
void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);

irqreturn_t tmio_mmc_irq(int irq, void *devid);



#ifdef CONFIG_PM

int tmio_mmc_host_runtime_suspend(struct device *dev);

int tmio_mmc_host_runtime_resume(struct device *dev);

#endif



static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)

{