diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-07 14:48:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-07 14:48:16 +0100 |
| commit | 7bdfb2bf3ae54c78bac2ee9211bc0aec777294d8 (patch) | |
| tree | c1add2f7654a42934be773e5e346c747b40355f1 | |
| parent | 5544729e2a1aca4bd2210e96754665eaafabc761 (diff) | |
| parent | c868291c2b3d74d5f1cae748a9452b340b21f1d1 (diff) | |
| download | linux-next-7bdfb2bf3ae54c78bac2ee9211bc0aec777294d8.tar.gz linux-next-7bdfb2bf3ae54c78bac2ee9211bc0aec777294d8.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git
| -rw-r--r-- | drivers/auxdisplay/arm-charlcd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/auxdisplay/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c index 70efda4f767e..ea684f3446c3 100644 --- a/drivers/auxdisplay/arm-charlcd.c +++ b/drivers/auxdisplay/arm-charlcd.c @@ -306,10 +306,7 @@ static int charlcd_resume(struct device *dev) return 0; } -static const struct dev_pm_ops charlcd_pm_ops = { - .suspend = charlcd_suspend, - .resume = charlcd_resume, -}; +static DEFINE_SIMPLE_DEV_PM_OPS(charlcd_pm_ops, charlcd_suspend, charlcd_resume); static const struct of_device_id charlcd_match[] = { { .compatible = "arm,versatile-lcd", }, @@ -319,7 +316,7 @@ static const struct of_device_id charlcd_match[] = { static struct platform_driver charlcd_driver = { .driver = { .name = DRIVERNAME, - .pm = &charlcd_pm_ops, + .pm = pm_sleep_ptr(&charlcd_pm_ops), .suppress_bind_attrs = true, .of_match_table = charlcd_match, }, |