[PATCH] media: rc: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Triet Hoang <[email protected]>
| Newsgroups | org.infradead.lists.linux-amlogic,dev.linux.lists.linux-sunxi,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-kernel,org.kernel.vger.linux-media |
|---|---|
| Message-ID | <[email protected]> |
Convert the deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This lets us drop the __maybe_unused annotations from its suspend and resume callbacks, also reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled. Signed-off-by: Triet Hoang <[email protected]> --- drivers/media/rc/meson-ir.c | 6 +++--- drivers/media/rc/sunxi-cir.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c index 272ebb0d97c8..795b38ca864a 100644 --- a/drivers/media/rc/meson-ir.c +++ b/drivers/media/rc/meson-ir.c @@ -567,7 +567,7 @@ static void meson_ir_shutdown(struct platform_device *pdev) spin_unlock_irqrestore(&ir->lock, flags); } -static __maybe_unused int meson_ir_resume(struct device *dev) +static int meson_ir_resume(struct device *dev) { struct meson_ir *ir = dev_get_drvdata(dev); @@ -579,7 +579,7 @@ static __maybe_unused int meson_ir_resume(struct device *dev) return 0; } -static __maybe_unused int meson_ir_suspend(struct device *dev) +static int meson_ir_suspend(struct device *dev) { struct meson_ir *ir = dev_get_drvdata(dev); unsigned long flags; @@ -591,7 +591,7 @@ static __maybe_unused int meson_ir_suspend(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(meson_ir_pm_ops, meson_ir_suspend, meson_ir_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(meson_ir_pm_ops, meson_ir_suspend, meson_ir_resume); static const struct meson_ir_param meson6_ir_param = { .support_hw_decoder = false, diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c index 28e840a7e5b8..7fd48c510143 100644 --- a/drivers/media/rc/sunxi-cir.c +++ b/drivers/media/rc/sunxi-cir.c @@ -236,19 +236,19 @@ static void sunxi_ir_hw_exit(struct device *dev) reset_control_assert(ir->rst); } -static int __maybe_unused sunxi_ir_suspend(struct device *dev) +static int sunxi_ir_suspend(struct device *dev) { sunxi_ir_hw_exit(dev); return 0; } -static int __maybe_unused sunxi_ir_resume(struct device *dev) +static int sunxi_ir_resume(struct device *dev) { return sunxi_ir_hw_init(dev); } -static SIMPLE_DEV_PM_OPS(sunxi_ir_pm_ops, sunxi_ir_suspend, sunxi_ir_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(sunxi_ir_pm_ops, sunxi_ir_suspend, sunxi_ir_resume); static int sunxi_ir_probe(struct platform_device *pdev) { @@ -422,7 +422,7 @@ static struct platform_driver sunxi_ir_driver = { .driver = { .name = SUNXI_IR_DEV, .of_match_table = sunxi_ir_match, - .pm = &sunxi_ir_pm_ops, + .pm = pm_sleep_ptr(&sunxi_ir_pm_ops), }, }; -- 2.53.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic