]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
backlight: backlight: Drop backlight_put()
authorSam Ravnborg <sam@ravnborg.org>
Sun, 19 Jul 2020 08:07:42 +0000 (10:07 +0200)
committerLee Jones <lee.jones@linaro.org>
Mon, 20 Jul 2020 09:27:09 +0000 (10:27 +0100)
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@ravnborg.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/video/backlight/backlight.c
include/linux/backlight.h

index 82dc93ca859ad33d6602351f86ba032a251a44f1..cba8505fef5a37bf9aa9e79e0dc091a94078c935 100644 (file)
@@ -718,7 +718,10 @@ EXPORT_SYMBOL(of_find_backlight);
 
 static void devm_backlight_release(void *data)
 {
-       backlight_put(data);
+       struct backlight_device *bd = data;
+
+       if (bd)
+               put_device(&bd->dev);
 }
 
 /**
@@ -746,7 +749,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;
index 26e89a8033f587eb6ccfd82b91515fa68e1b835b..64f91324c9116b42c6b5d1d1c0c053256d91edef 100644 (file)
@@ -388,16 +388,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