On Sun, May 17, 2020 at 09:01:37PM +0200, Sam Ravnborg wrote:
> There are no external users of backlight_put().
> Drop it and open code the two users in backlight.c.
>
> Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Daniel Thompson <daniel.thompson@xxxxxxxxxx>
> Cc: Jingoo Han <jingoohan1@xxxxxxxxx>
Reviewed-by: Daniel Thompson <daniel.thompson@xxxxxxxxxx>
> ---
> drivers/video/backlight/backlight.c | 7 +++++--
> include/linux/backlight.h | 10 ----------
> 2 files changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
> index e23b09d03a65..7f3eecaf8317 100644
> --- a/drivers/video/backlight/backlight.c
> +++ b/drivers/video/backlight/backlight.c
> @@ -679,7 +679,10 @@ static struct backlight_device *of_find_backlight(struct device *dev)
>
> static void devm_backlight_release(void *data)
> {
> - backlight_put(data);
> + struct backlight_device *bd = data;
> +
> + if (bd)
> + put_device(&bd->dev);
> }
>
> /**
> @@ -707,7 +710,7 @@ struct backlight_device *devm_of_find_backlight(struct device *dev)
> return bd;
> ret = devm_add_action(dev, devm_backlight_release, bd);
> if (ret) {
> - backlight_put(bd);
> + put_device(&bd->dev);
> return ERR_PTR(ret);
> }
> return bd;
> diff --git a/include/linux/backlight.h b/include/linux/backlight.h
> index 99e7cdace2be..d92e523650ec 100644
> --- a/include/linux/backlight.h
> +++ b/include/linux/backlight.h
> @@ -415,16 +415,6 @@ static inline int backlight_disable(struct backlight_device *bd)
> return backlight_update_status(bd);
> }
>
> -/**
> - * backlight_put - Drop backlight reference
> - * @bd: the backlight device to put
> - */
> -static inline void backlight_put(struct backlight_device *bd)
> -{
> - if (bd)
> - put_device(&bd->dev);
> -}
> -
> /**
> * backlight_is_blank - Return true if display is expected to be blank
> * @bd: the backlight device
> --
> 2.25.1
>
