Re: [PATCH 2/3] PM: wakeup: Remove unnecessary else from device_init_wakeup

[Rafael J. Wysocki]

On Mon, Mar 18, 2024 at 6:55 AM Dhruva Gole <d-gole@xxxxxx> wrote:
>
> Checkpatch warns that else is generally not necessary after a return
> condition which exists in the if part of this function. Hence, just to
> abide by what checkpatch recommends, follow it's guidelines.
>
> Signed-off-by: Dhruva Gole <d-gole@xxxxxx>
> ---
>  include/linux/pm_wakeup.h | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
> index 428803eed798..76cd1f9f1365 100644
> --- a/include/linux/pm_wakeup.h
> +++ b/include/linux/pm_wakeup.h
> @@ -234,11 +234,10 @@ static inline int device_init_wakeup(struct device *dev, bool enable)
>         if (enable) {
>                 device_set_wakeup_capable(dev, true);
>                 return device_wakeup_enable(dev);
> -       } else {
> -               device_wakeup_disable(dev);
> -               device_set_wakeup_capable(dev, false);
> -               return 0;
>         }
> +       device_wakeup_disable(dev);
> +       device_set_wakeup_capable(dev, false);
> +       return 0;
>  }
>
>  #endif /* _LINUX_PM_WAKEUP_H */
> --

This one is fine with me, but not 6.9-rc material.

Thanks!