Commit 03562954 authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Thomas Gleixner
Browse files

clocksource/drivers/ingenic-ost: Define pm functions properly in platform_driver struct 



Commit ca7b72b5 ("clocksource: Add driver for the Ingenic JZ47xx OST")
adds the struct platform_driver ingenic_ost_driver, with the definition of
pm functions under the non-existing config PM_SUSPEND, which means the
intended pm functions were never actually included in any build.

As the only callbacks are .suspend_noirq and .resume_noirq, we can assume
that it is intended to be CONFIG_PM_SLEEP.

Since commit 1a3c7bb0 ("PM: core: Add new *_PM_OPS macros, deprecate
old ones"), the default pattern for platform_driver definitions
conditional for CONFIG_PM_SLEEP is to use pm_sleep_ptr().

As __maybe_unused annotations on the dev_pm_ops structure and its callbacks
are not needed anymore, remove these as well.

Suggested-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20221123083159.22821-1-lukas.bulwahn@gmail.com
parent 3f44f715

drivers/clocksource/ingenic-ost.c

+4 −6
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int __init ingenic_ost_probe(struct platform_device *pdev) 
	return 0;

}



static int __maybe_unused ingenic_ost_suspend(struct device *dev)

static int ingenic_ost_suspend(struct device *dev)

{

	struct ingenic_ost *ost = dev_get_drvdata(dev);
@@ -150,14 +150,14 @@ static int __maybe_unused ingenic_ost_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused ingenic_ost_resume(struct device *dev)

static int ingenic_ost_resume(struct device *dev)

{

	struct ingenic_ost *ost = dev_get_drvdata(dev);



	return clk_enable(ost->clk);

}



static const struct dev_pm_ops __maybe_unused ingenic_ost_pm_ops = {

static const struct dev_pm_ops ingenic_ost_pm_ops = {

	/* _noirq: We want the OST clock to be gated last / ungated first */

	.suspend_noirq = ingenic_ost_suspend,

	.resume_noirq  = ingenic_ost_resume,
@@ -181,9 +181,7 @@ static const struct of_device_id ingenic_ost_of_match[] = { 
static struct platform_driver ingenic_ost_driver = {

	.driver = {

		.name = "ingenic-ost",

#ifdef CONFIG_PM_SUSPEND

		.pm = &ingenic_ost_pm_ops,

#endif

		.pm = pm_sleep_ptr(&ingenic_ost_pm_ops),

		.of_match_table = ingenic_ost_of_match,

	},

};