Commit a120f217 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Ulf Hansson
Browse files

mmc: toshsd: use modern PM macros 



Use the modern PM macros for the suspend and resume functions to be
automatically dropped by the compiler when CONFIG_PM or
CONFIG_PM_SLEEP are disabled, without having to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20250815013413.28641-31-jszhang@kernel.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b2af65ae

drivers/mmc/host/toshsd.c

+2 −6
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ static void toshsd_powerdown(struct toshsd_host *host) 
	pci_write_config_byte(host->pdev, SD_PCICFG_CLKSTOP, 0);

}



#ifdef CONFIG_PM_SLEEP

static int toshsd_pm_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);
@@ -599,7 +598,6 @@ static int toshsd_pm_resume(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM_SLEEP */



static int toshsd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{
@@ -688,16 +686,14 @@ static void toshsd_remove(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



static const struct dev_pm_ops toshsd_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(toshsd_pm_suspend, toshsd_pm_resume)

};

static DEFINE_SIMPLE_DEV_PM_OPS(toshsd_pm_ops, toshsd_pm_suspend, toshsd_pm_resume);



static struct pci_driver toshsd_driver = {

	.name = DRIVER_NAME,

	.id_table = pci_ids,

	.probe = toshsd_probe,

	.remove = toshsd_remove,

	.driver.pm = &toshsd_pm_ops,

	.driver.pm = pm_sleep_ptr(&toshsd_pm_ops),

};



module_pci_driver(toshsd_driver);