Message ID | 20231023174616.2282067-15-u.kleine-koenig@pengutronix.de |
---|---|
State | Accepted |
Delegated to: | Uwe Kleine-König |
Headers | show |
Series | pwm: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions | expand |
On 23/10/2023 at 19:46, Uwe Kleine-König wrote: > This macro has the advantage over SIMPLE_DEV_PM_OPS that we don't have to > care about when the functions are actually used, so the corresponding > #ifdef can be dropped. Commit message is fine ;-) > > Also make use of pm_ptr() to discard all PM related stuff if CONFIG_PM > isn't enabled. > > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks Uwe for this cleanup. Best regards, Nicolas > --- > drivers/pwm/pwm-atmel-tcb.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/pwm/pwm-atmel-tcb.c b/drivers/pwm/pwm-atmel-tcb.c > index 98b33c016c3c..d42c897cb85e 100644 > --- a/drivers/pwm/pwm-atmel-tcb.c > +++ b/drivers/pwm/pwm-atmel-tcb.c > @@ -489,7 +489,6 @@ static const struct of_device_id atmel_tcb_pwm_dt_ids[] = { > }; > MODULE_DEVICE_TABLE(of, atmel_tcb_pwm_dt_ids); > > -#ifdef CONFIG_PM_SLEEP > static int atmel_tcb_pwm_suspend(struct device *dev) > { > struct atmel_tcb_pwm_chip *tcbpwm = dev_get_drvdata(dev); > @@ -522,16 +521,15 @@ static int atmel_tcb_pwm_resume(struct device *dev) > > return 0; > } > -#endif > > -static SIMPLE_DEV_PM_OPS(atmel_tcb_pwm_pm_ops, atmel_tcb_pwm_suspend, > - atmel_tcb_pwm_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(atmel_tcb_pwm_pm_ops, atmel_tcb_pwm_suspend, > + atmel_tcb_pwm_resume); > > static struct platform_driver atmel_tcb_pwm_driver = { > .driver = { > .name = "atmel-tcb-pwm", > .of_match_table = atmel_tcb_pwm_dt_ids, > - .pm = &atmel_tcb_pwm_pm_ops, > + .pm = pm_ptr(&atmel_tcb_pwm_pm_ops), > }, > .probe = atmel_tcb_pwm_probe, > .remove_new = atmel_tcb_pwm_remove, > -- > 2.42.0 >
diff --git a/drivers/pwm/pwm-atmel-tcb.c b/drivers/pwm/pwm-atmel-tcb.c index 98b33c016c3c..d42c897cb85e 100644 --- a/drivers/pwm/pwm-atmel-tcb.c +++ b/drivers/pwm/pwm-atmel-tcb.c @@ -489,7 +489,6 @@ static const struct of_device_id atmel_tcb_pwm_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, atmel_tcb_pwm_dt_ids); -#ifdef CONFIG_PM_SLEEP static int atmel_tcb_pwm_suspend(struct device *dev) { struct atmel_tcb_pwm_chip *tcbpwm = dev_get_drvdata(dev); @@ -522,16 +521,15 @@ static int atmel_tcb_pwm_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(atmel_tcb_pwm_pm_ops, atmel_tcb_pwm_suspend, - atmel_tcb_pwm_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(atmel_tcb_pwm_pm_ops, atmel_tcb_pwm_suspend, + atmel_tcb_pwm_resume); static struct platform_driver atmel_tcb_pwm_driver = { .driver = { .name = "atmel-tcb-pwm", .of_match_table = atmel_tcb_pwm_dt_ids, - .pm = &atmel_tcb_pwm_pm_ops, + .pm = pm_ptr(&atmel_tcb_pwm_pm_ops), }, .probe = atmel_tcb_pwm_probe, .remove_new = atmel_tcb_pwm_remove,