Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

Pull backlight changes from Lee Jones:
  Changes to existing drivers:
   - remove get brightness implementations in via-pmu-backlight
     samsung-q10 aat2870_bl ams369fg06 bd6107 gpio_backlight ld9040
     lp855x_bl lp8788_bl lv5207lp pandora_bl pwm_bl s6e63m0 tps65217_bl
     aty128fb atyfb_base radeon_backlight s6e8ax0 nv_backlight
     riva/fbdev
   - improve error handling in jornada720_lcd
   - make use of new 'get optional' GPIO command in pwm_bl
   - fix sparse warning in ipaq_micro_bl

  New drivers/supported devices:
   - new driver for iPAQ"

* tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: ipaq_micro: Fix sparse non static symbol warning
  backlight: Add driver for iPAQ micro backlight
  backlight: pwm-backlight: Use devm_gpiod_get_optional()
  backlight: jornada720: Minimise code duplication and handle errors better
  backlight: Show brightness even if get_brightness is not implemented
  backlight: Remove trivial get_brightness implementations

23 files changed, 116 insertions, 131 deletions

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 5d449059a556..cc153f55d9f9 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -207,6 +207,15 @@ config BACKLIGHT_GENERIC
           known as the Corgi backlight driver. If you have a Sharp Zaurus
           SL-C7xx, SL-Cxx00 or SL-6000x say y.
 
+config BACKLIGHT_IPAQ_MICRO
+        tristate "iPAQ microcontroller backlight driver"
+        depends on MFD_IPAQ_MICRO
+        default y
+        help
+          Say y to enable the backlight driver for Compaq iPAQ handheld
+          computers. Say yes if you have one of the h3100/h3600/h3700
+          machines.
+
 config BACKLIGHT_LM3533
         tristate "Backlight Driver for LM3533"
         depends on BACKLIGHT_CLASS_DEVICE
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index bb820024f346..a9ea34a39cad 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_BACKLIGHT_GENERIC)		+= generic_bl.o
 obj-$(CONFIG_BACKLIGHT_GPIO)            += gpio_backlight.o
 obj-$(CONFIG_BACKLIGHT_HP680)           += hp680_bl.o
 obj-$(CONFIG_BACKLIGHT_HP700)           += jornada720_bl.o
+obj-$(CONFIG_BACKLIGHT_IPAQ_MICRO)      += ipaq_micro_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3533)          += lm3533_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3630A)         += lm3630a_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3639)          += lm3639_bl.o
diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c
index ec5350f2c28a..86234c31d79c 100644
--- a/drivers/video/backlight/aat2870_bl.c
+++ b/drivers/video/backlight/aat2870_bl.c
@@ -67,11 +67,6 @@ static inline int aat2870_bl_disable(struct aat2870_bl_driver_data *aat2870_bl)
         return aat2870->write(aat2870, AAT2870_BL_CH_EN, 0x0);
 }
 
-static int aat2870_bl_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static int aat2870_bl_update_status(struct backlight_device *bd)
 {
         struct aat2870_bl_driver_data *aat2870_bl = bl_get_data(bd);
@@ -120,7 +115,6 @@ static int aat2870_bl_check_fb(struct backlight_device *bd, struct fb_info *fi)
 
 static const struct backlight_ops aat2870_bl_ops = {
         .options = BL_CORE_SUSPENDRESUME,
-        .get_brightness = aat2870_bl_get_brightness,
         .update_status = aat2870_bl_update_status,
         .check_fb = aat2870_bl_check_fb,
 };
diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index d8952c4aa689..4726c8be626f 100644
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -410,11 +410,6 @@ static int ams369fg06_set_power(struct lcd_device *ld, int power)
         return ams369fg06_power(lcd, power);
 }
 
-static int ams369fg06_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static int ams369fg06_set_brightness(struct backlight_device *bd)
 {
         int ret = 0;
@@ -443,7 +438,6 @@ static struct lcd_ops ams369fg06_lcd_ops = {
 };
 
 static const struct backlight_ops ams369fg06_backlight_ops = {
-        .get_brightness = ams369fg06_get_brightness,
         .update_status = ams369fg06_set_brightness,
 };
 
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 428089009cd5..bddc8b17a4d8 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -223,6 +223,8 @@ static ssize_t actual_brightness_show(struct device *dev,
         mutex_lock(&bd->ops_lock);
         if (bd->ops && bd->ops->get_brightness)
                 rc = sprintf(buf, "%d\n", bd->ops->get_brightness(bd));
+        else
+                rc = sprintf(buf, "%d\n", bd->props.brightness);
         mutex_unlock(&bd->ops_lock);
 
         return rc;
diff --git a/drivers/video/backlight/bd6107.c b/drivers/video/backlight/bd6107.c
index 16dd9bc625bd..fdb2f7e2c6b5 100644
--- a/drivers/video/backlight/bd6107.c
+++ b/drivers/video/backlight/bd6107.c
@@ -105,11 +105,6 @@ static int bd6107_backlight_update_status(struct backlight_device *backlight)
         return 0;
 }
 
-static int bd6107_backlight_get_brightness(struct backlight_device *backlight)
-{
-        return backlight->props.brightness;
-}
-
 static int bd6107_backlight_check_fb(struct backlight_device *backlight,
                                        struct fb_info *info)
 {
@@ -121,7 +116,6 @@ static int bd6107_backlight_check_fb(struct backlight_device *backlight,
 static const struct backlight_ops bd6107_backlight_ops = {
         .options        = BL_CORE_SUSPENDRESUME,
         .update_status  = bd6107_backlight_update_status,
-        .get_brightness = bd6107_backlight_get_brightness,
         .check_fb       = bd6107_backlight_check_fb,
 };
 
diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c
index 1cea68848f1a..aaead04a2d54 100644
--- a/drivers/video/backlight/gpio_backlight.c
+++ b/drivers/video/backlight/gpio_backlight.c
@@ -44,11 +44,6 @@ static int gpio_backlight_update_status(struct backlight_device *bl)
         return 0;
 }
 
-static int gpio_backlight_get_brightness(struct backlight_device *bl)
-{
-        return bl->props.brightness;
-}
-
 static int gpio_backlight_check_fb(struct backlight_device *bl,
                                    struct fb_info *info)
 {
@@ -60,7 +55,6 @@ static int gpio_backlight_check_fb(struct backlight_device *bl,
 static const struct backlight_ops gpio_backlight_ops = {
         .options        = BL_CORE_SUSPENDRESUME,
         .update_status  = gpio_backlight_update_status,
-        .get_brightness = gpio_backlight_get_brightness,
         .check_fb       = gpio_backlight_check_fb,
 };
 
diff --git a/drivers/video/backlight/ipaq_micro_bl.c b/drivers/video/backlight/ipaq_micro_bl.c
new file mode 100644
index 000000000000..347dc11d4ceb
--- /dev/null
+++ b/drivers/video/backlight/ipaq_micro_bl.c
@@ -0,0 +1,83 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * iPAQ microcontroller backlight support
+ * Author : Linus Walleij <linus.walleij@linaro.org>
+ */
+
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/mfd/ipaq-micro.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+static int micro_bl_update_status(struct backlight_device *bd)
+{
+        struct ipaq_micro *micro = dev_get_drvdata(&bd->dev);
+        int intensity = bd->props.brightness;
+        struct ipaq_micro_msg msg = {
+                .id = MSG_BACKLIGHT,
+                .tx_len = 3,
+        };
+
+        if (bd->props.power != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (bd->props.state & (BL_CORE_FBBLANK | BL_CORE_SUSPENDED))
+                intensity = 0;
+
+        /*
+         * Message format:
+         * Byte 0: backlight instance (usually 1)
+         * Byte 1: on/off
+         * Byte 2: intensity, 0-255
+         */
+        msg.tx_data[0] = 0x01;
+        msg.tx_data[1] = intensity > 0 ? 1 : 0;
+        msg.tx_data[2] = intensity;
+        return ipaq_micro_tx_msg_sync(micro, &msg);
+}
+
+static const struct backlight_ops micro_bl_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
+        .update_status  = micro_bl_update_status,
+};
+
+static struct backlight_properties micro_bl_props = {
+        .type = BACKLIGHT_RAW,
+        .max_brightness = 255,
+        .power = FB_BLANK_UNBLANK,
+        .brightness = 64,
+};
+
+static int micro_backlight_probe(struct platform_device *pdev)
+{
+        struct backlight_device *bd;
+        struct ipaq_micro *micro = dev_get_drvdata(pdev->dev.parent);
+
+        bd = devm_backlight_device_register(&pdev->dev, "ipaq-micro-backlight",
+                                            &pdev->dev, micro, &micro_bl_ops,
+                                            &micro_bl_props);
+        if (IS_ERR(bd))
+                return PTR_ERR(bd);
+
+        platform_set_drvdata(pdev, bd);
+        backlight_update_status(bd);
+
+        return 0;
+}
+
+static struct platform_driver micro_backlight_device_driver = {
+        .driver = {
+                .name    = "ipaq-micro-backlight",
+        },
+        .probe   = micro_backlight_probe,
+};
+module_platform_driver(micro_backlight_device_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("driver for iPAQ Atmel micro backlight");
+MODULE_ALIAS("platform:ipaq-micro-backlight");
diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c
index da3876c9b3ae..228bc319de19 100644
--- a/drivers/video/backlight/jornada720_lcd.c
+++ b/drivers/video/backlight/jornada720_lcd.c
@@ -43,37 +43,38 @@ static int jornada_lcd_get_contrast(struct lcd_device *ld)
 
         jornada_ssp_start();
 
-        if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) {
-                dev_err(&ld->dev, "get contrast failed\n");
-                jornada_ssp_end();
-                return -ETIMEDOUT;
-        } else {
+        if (jornada_ssp_byte(GETCONTRAST) == TXDUMMY) {
                 ret = jornada_ssp_byte(TXDUMMY);
-                jornada_ssp_end();
-                return ret;
+                goto success;
         }
+
+        dev_err(&ld->dev, "failed to set contrast\n");
+        ret = -ETIMEDOUT;
+
+success:
+        jornada_ssp_end();
+        return ret;
 }
 
 static int jornada_lcd_set_contrast(struct lcd_device *ld, int value)
 {
-        int ret;
+        int ret = 0;
 
         jornada_ssp_start();
 
         /* start by sending our set contrast cmd to mcu */
-        ret = jornada_ssp_byte(SETCONTRAST);
-
-        /* push the new value */
-        if (jornada_ssp_byte(value) != TXDUMMY) {
-                dev_err(&ld->dev, "set contrast failed\n");
-                jornada_ssp_end();
-                return -ETIMEDOUT;
+        if (jornada_ssp_byte(SETCONTRAST) == TXDUMMY) {
+                /* if successful push the new value */
+                if (jornada_ssp_byte(value) == TXDUMMY)
+                        goto success;
         }
 
-        /* if we get here we can assume everything went well */
-        jornada_ssp_end();
+        dev_err(&ld->dev, "failed to set contrast\n");
+        ret = -ETIMEDOUT;
 
-        return 0;
+success:
+        jornada_ssp_end();
+        return ret;
 }
 
 static int jornada_lcd_set_power(struct lcd_device *ld, int power)
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index 506a6c236039..ccb44e8e4927 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -642,11 +642,6 @@ static int ld9040_get_power(struct lcd_device *ld)
         return lcd->power;
 }
 
-static int ld9040_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static int ld9040_set_brightness(struct backlight_device *bd)
 {
         int ret = 0, brightness = bd->props.brightness;
@@ -674,7 +669,6 @@ static struct lcd_ops ld9040_lcd_ops = {
 };
 
 static const struct backlight_ops ld9040_backlight_ops  = {
-        .get_brightness = ld9040_get_brightness,
         .update_status = ld9040_set_brightness,
 };
 
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index 2ca3a040007b..dcdd5443efcf 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -274,15 +274,9 @@ static int lp855x_bl_update_status(struct backlight_device *bl)
         return 0;
 }
 
-static int lp855x_bl_get_brightness(struct backlight_device *bl)
-{
-        return bl->props.brightness;
-}
-
 static const struct backlight_ops lp855x_bl_ops = {
         .options = BL_CORE_SUSPENDRESUME,
         .update_status = lp855x_bl_update_status,
-        .get_brightness = lp855x_bl_get_brightness,
 };
 
 static int lp855x_backlight_register(struct lp855x *lp)
diff --git a/drivers/video/backlight/lp8788_bl.c b/drivers/video/backlight/lp8788_bl.c
index daba34dc46d4..d6c4f6a2d43e 100644
--- a/drivers/video/backlight/lp8788_bl.c
+++ b/drivers/video/backlight/lp8788_bl.c
@@ -176,15 +176,9 @@ static int lp8788_bl_update_status(struct backlight_device *bl_dev)
         return 0;
 }
 
-static int lp8788_bl_get_brightness(struct backlight_device *bl_dev)
-{
-        return bl_dev->props.brightness;
-}
-
 static const struct backlight_ops lp8788_bl_ops = {
         .options = BL_CORE_SUSPENDRESUME,
         .update_status = lp8788_bl_update_status,
-        .get_brightness = lp8788_bl_get_brightness,
 };
 
 static int lp8788_backlight_register(struct lp8788_bl *bl)
diff --git a/drivers/video/backlight/lv5207lp.c b/drivers/video/backlight/lv5207lp.c
index 1802b2d1357d..8ab7297b118a 100644
--- a/drivers/video/backlight/lv5207lp.c
+++ b/drivers/video/backlight/lv5207lp.c
@@ -70,11 +70,6 @@ static int lv5207lp_backlight_update_status(struct backlight_device *backlight)
         return 0;
 }
 
-static int lv5207lp_backlight_get_brightness(struct backlight_device *backlight)
-{
-        return backlight->props.brightness;
-}
-
 static int lv5207lp_backlight_check_fb(struct backlight_device *backlight,
                                        struct fb_info *info)
 {
@@ -86,7 +81,6 @@ static int lv5207lp_backlight_check_fb(struct backlight_device *backlight,
 static const struct backlight_ops lv5207lp_backlight_ops = {
         .options        = BL_CORE_SUSPENDRESUME,
         .update_status  = lv5207lp_backlight_update_status,
-        .get_brightness = lv5207lp_backlight_get_brightness,
         .check_fb       = lv5207lp_backlight_check_fb,
 };
 
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
index 2098c5d6efb9..2e3f82063c03 100644
--- a/drivers/video/backlight/pandora_bl.c
+++ b/drivers/video/backlight/pandora_bl.c
@@ -100,15 +100,9 @@ done:
         return 0;
 }
 
-static int pandora_backlight_get_brightness(struct backlight_device *bl)
-{
-        return bl->props.brightness;
-}
-
 static const struct backlight_ops pandora_backlight_ops = {
         .options        = BL_CORE_SUSPENDRESUME,
         .update_status  = pandora_backlight_update_status,
-        .get_brightness = pandora_backlight_get_brightness,
 };
 
 static int pandora_backlight_probe(struct platform_device *pdev)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 38ca88bc5c3e..d7a3d13e72ec 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -115,11 +115,6 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
         return 0;
 }
 
-static int pwm_backlight_get_brightness(struct backlight_device *bl)
-{
-        return bl->props.brightness;
-}
-
 static int pwm_backlight_check_fb(struct backlight_device *bl,
                                   struct fb_info *info)
 {
@@ -130,7 +125,6 @@ static int pwm_backlight_check_fb(struct backlight_device *bl,
 
 static const struct backlight_ops pwm_backlight_ops = {
         .update_status  = pwm_backlight_update_status,
-        .get_brightness = pwm_backlight_get_brightness,
         .check_fb       = pwm_backlight_check_fb,
 };
 
@@ -245,13 +239,10 @@ static int pwm_backlight_probe(struct platform_device *pdev)
         pb->dev = &pdev->dev;
         pb->enabled = false;
 
-        pb->enable_gpio = devm_gpiod_get(&pdev->dev, "enable");
+        pb->enable_gpio = devm_gpiod_get_optional(&pdev->dev, "enable");
         if (IS_ERR(pb->enable_gpio)) {
                 ret = PTR_ERR(pb->enable_gpio);
-                if (ret == -ENOENT)
-                        pb->enable_gpio = NULL;
-                else
-                        goto err_alloc;
+                goto err_alloc;
         }
 
         /*
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index 2d6d48196c6d..f3a65c8940ed 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -597,11 +597,6 @@ static int s6e63m0_get_power(struct lcd_device *ld)
         return lcd->power;
 }
 
-static int s6e63m0_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static int s6e63m0_set_brightness(struct backlight_device *bd)
 {
         int ret = 0, brightness = bd->props.brightness;
@@ -629,7 +624,6 @@ static struct lcd_ops s6e63m0_lcd_ops = {
 };
 
 static const struct backlight_ops s6e63m0_backlight_ops  = {
-        .get_brightness = s6e63m0_get_brightness,
         .update_status = s6e63m0_set_brightness,
 };
 
diff --git a/drivers/video/backlight/tps65217_bl.c b/drivers/video/backlight/tps65217_bl.c
index 595dcf561020..2e04d93aa0ef 100644
--- a/drivers/video/backlight/tps65217_bl.c
+++ b/drivers/video/backlight/tps65217_bl.c
@@ -109,15 +109,9 @@ static int tps65217_bl_update_status(struct backlight_device *bl)
         return rc;
 }
 
-static int tps65217_bl_get_brightness(struct backlight_device *bl)
-{
-        return bl->props.brightness;
-}
-
 static const struct backlight_ops tps65217_bl_ops = {
         .options        = BL_CORE_SUSPENDRESUME,
         .update_status  = tps65217_bl_update_status,
-        .get_brightness = tps65217_bl_get_brightness
 };
 
 static int tps65217_bl_hw_init(struct tps65217_bl *tps65217_bl,
diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
index 52108be69e77..ff6070170d01 100644
--- a/drivers/video/fbdev/aty/aty128fb.c
+++ b/drivers/video/fbdev/aty/aty128fb.c
@@ -1802,13 +1802,7 @@ static int aty128_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
-static int aty128_bl_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static const struct backlight_ops aty128_bl_data = {
-        .get_brightness = aty128_bl_get_brightness,
         .update_status  = aty128_bl_update_status,
 };
 
diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index c3d0074a32db..37ec09b3fffd 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -2211,13 +2211,7 @@ static int aty_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
-static int aty_bl_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static const struct backlight_ops aty_bl_data = {
-        .get_brightness = aty_bl_get_brightness,
         .update_status  = aty_bl_update_status,
 };
 
diff --git a/drivers/video/fbdev/aty/radeon_backlight.c b/drivers/video/fbdev/aty/radeon_backlight.c
index db572df7e1ef..301d6d6aeead 100644
--- a/drivers/video/fbdev/aty/radeon_backlight.c
+++ b/drivers/video/fbdev/aty/radeon_backlight.c
@@ -123,13 +123,7 @@ static int radeon_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
-static int radeon_bl_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static const struct backlight_ops radeon_bl_data = {
-        .get_brightness = radeon_bl_get_brightness,
         .update_status  = radeon_bl_update_status,
 };
 
diff --git a/drivers/video/fbdev/exynos/s6e8ax0.c b/drivers/video/fbdev/exynos/s6e8ax0.c
index 29e70ed3f154..95873f26e39c 100644
--- a/drivers/video/fbdev/exynos/s6e8ax0.c
+++ b/drivers/video/fbdev/exynos/s6e8ax0.c
@@ -704,11 +704,6 @@ static int s6e8ax0_get_power(struct lcd_device *ld)
         return lcd->power;
 }
 
-static int s6e8ax0_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static int s6e8ax0_set_brightness(struct backlight_device *bd)
 {
         int ret = 0, brightness = bd->props.brightness;
@@ -736,7 +731,6 @@ static struct lcd_ops s6e8ax0_lcd_ops = {
 };
 
 static const struct backlight_ops s6e8ax0_backlight_ops = {
-        .get_brightness = s6e8ax0_get_brightness,
         .update_status = s6e8ax0_set_brightness,
 };
 
diff --git a/drivers/video/fbdev/nvidia/nv_backlight.c b/drivers/video/fbdev/nvidia/nv_backlight.c
index 8471008aa6ff..5c151b2ea683 100644
--- a/drivers/video/fbdev/nvidia/nv_backlight.c
+++ b/drivers/video/fbdev/nvidia/nv_backlight.c
@@ -82,13 +82,7 @@ static int nvidia_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
-static int nvidia_bl_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static const struct backlight_ops nvidia_bl_ops = {
-        .get_brightness = nvidia_bl_get_brightness,
         .update_status  = nvidia_bl_update_status,
 };
 
diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c
index 8a8d7f060784..be73727c7227 100644
--- a/drivers/video/fbdev/riva/fbdev.c
+++ b/drivers/video/fbdev/riva/fbdev.c
@@ -326,13 +326,7 @@ static int riva_bl_update_status(struct backlight_device *bd)
         return 0;
 }
 
-static int riva_bl_get_brightness(struct backlight_device *bd)
-{
-        return bd->props.brightness;
-}
-
 static const struct backlight_ops riva_bl_ops = {
-        .get_brightness = riva_bl_get_brightness,
         .update_status  = riva_bl_update_status,
 };