[PATCH] Rewritten backlight infrastructure for portable Apple computers

This patch contains a total rewrite of the backlight infrastructure for
portable Apple computers.  Backward compatibility is retained.  A sysfs
interface allows userland to control the brightness with more steps than
before.  Userland is allowed to upload a brightness curve for different
monitors, similar to Mac OS X.

[akpm@osdl.org: add needed exports]
Signed-off-by: Michael Hanselmann <linux-kernel@hansmi.ch>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 21 deletions

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 394334ec5765..c26e1236b275 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -503,9 +503,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
         case 0x1f: /* Powerbook button device */
           {
                 int down = (data[1] == (data[1] & 0xf));
-#ifdef CONFIG_PMAC_BACKLIGHT
-                int backlight = get_backlight_level();
-#endif
+
                 /*
                  * XXX: Where is the contrast control for the passive?
                  *  -- Cort
@@ -530,29 +528,17 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
 
                 case 0xa:       /* brightness decrease */
 #ifdef CONFIG_PMAC_BACKLIGHT
-                        if (!disable_kernel_backlight) {
-                                if (down && backlight >= 0) {
-                                        if (backlight > BACKLIGHT_OFF)
-                                                set_backlight_level(backlight-1);
-                                        else
-                                                set_backlight_level(BACKLIGHT_OFF);
-                                }
-                        }
-#endif /* CONFIG_PMAC_BACKLIGHT */
+                        if (!disable_kernel_backlight && down)
+                                pmac_backlight_key_down();
+#endif
                         input_report_key(adbhid[id]->input, KEY_BRIGHTNESSDOWN, down);
                         break;
 
                 case 0x9:       /* brightness increase */
 #ifdef CONFIG_PMAC_BACKLIGHT
-                        if (!disable_kernel_backlight) {
-                                if (down && backlight >= 0) {
-                                        if (backlight < BACKLIGHT_MAX)
-                                                set_backlight_level(backlight+1);
-                                        else 
-                                                set_backlight_level(BACKLIGHT_MAX);
-                                }
-                        }
-#endif /* CONFIG_PMAC_BACKLIGHT */
+                        if (!disable_kernel_backlight && down)
+                                pmac_backlight_key_up();
+#endif
                         input_report_key(adbhid[id]->input, KEY_BRIGHTNESSUP, down);
                         break;