Hi Andy,
Le lundi 17 juillet 2023 à 20:28 +0300, Andy Shevchenko a écrit :
> Cleaning up the driver to use pm_ptr() and *_PM_OPS() macros that
> make it simpler and allows the compiler to remove those functions
> if built without CONFIG_PM and CONFIG_PM_SLEEP support.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Reviewed-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Cheers,
-Paul
> ---
> drivers/pinctrl/intel/pinctrl-baytrail.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c
> b/drivers/pinctrl/intel/pinctrl-baytrail.c
> index 27aef62fc7c0..66aabac6be9c 100644
> --- a/drivers/pinctrl/intel/pinctrl-baytrail.c
> +++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
> @@ -1733,7 +1733,6 @@ static int byt_pinctrl_probe(struct
> platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> static int byt_gpio_suspend(struct device *dev)
> {
> struct intel_pinctrl *vg = dev_get_drvdata(dev);
> @@ -1817,9 +1816,7 @@ static int byt_gpio_resume(struct device *dev)
> raw_spin_unlock_irqrestore(&byt_lock, flags);
> return 0;
> }
> -#endif
>
> -#ifdef CONFIG_PM
> static int byt_gpio_runtime_suspend(struct device *dev)
> {
> return 0;
> @@ -1829,19 +1826,17 @@ static int byt_gpio_runtime_resume(struct
> device *dev)
> {
> return 0;
> }
> -#endif
>
> static const struct dev_pm_ops byt_gpio_pm_ops = {
> - SET_LATE_SYSTEM_SLEEP_PM_OPS(byt_gpio_suspend,
> byt_gpio_resume)
> - SET_RUNTIME_PM_OPS(byt_gpio_runtime_suspend,
> byt_gpio_runtime_resume,
> - NULL)
> + LATE_SYSTEM_SLEEP_PM_OPS(byt_gpio_suspend, byt_gpio_resume)
> + RUNTIME_PM_OPS(byt_gpio_runtime_suspend,
> byt_gpio_runtime_resume, NULL)
> };
>
> static struct platform_driver byt_gpio_driver = {
> .probe = byt_pinctrl_probe,
> .driver = {
> .name = "byt_gpio",
> - .pm = &byt_gpio_pm_ops,
> + .pm = pm_ptr(&byt_gpio_pm_ops),
> .acpi_match_table = byt_gpio_acpi_match,
> .suppress_bind_attrs = true,
> },
