diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-07 17:23:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-07 17:23:16 -0700 |
| commit | 7385d6fd88dd7981cdef8aa91e46570e5ba068c8 (patch) | |
| tree | e9cd26c7e4f28b0ec5dc192e217a23ea4c3e4cd1 /drivers/macintosh | |
| parent | e0b8b78651350e8dcf9cc60a959ccbcfc5bc3061 (diff) | |
| parent | 87464cdba2aeec196e75908fbbeaf4a26753637a (diff) | |
| download | linux-7385d6fd88dd7981cdef8aa91e46570e5ba068c8.tar.bz2 | |
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
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/via-pmu-backlight.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c index b1d91170ded0..6f68537c93ce 100644 --- a/drivers/macintosh/via-pmu-backlight.c +++ b/drivers/macintosh/via-pmu-backlight.c @@ -110,13 +110,7 @@ static int pmu_backlight_update_status(struct backlight_device *bd) } -static int pmu_backlight_get_brightness(struct backlight_device *bd) -{ - return bd->props.brightness; -} - static const struct backlight_ops pmu_backlight_data = { - .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, }; |