ACPI: replace kmalloc+memset with kzalloc
[linux-2.6.git] / drivers / acpi / video.c
index 7b10a7b..36b37d7 100644 (file)
@@ -3,6 +3,7 @@
  *
  *  Copyright (C) 2004 Luming Yu <luming.yu@intel.com>
  *  Copyright (C) 2004 Bruno Ducrot <ducrot@poupinou.org>
+ *  Copyright (C) 2006 Thomas Tuttle <linux-kernel@ttuttle.net>
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
 #define ACPI_VIDEO_NOTIFY_NEXT_OUTPUT  0x83
 #define ACPI_VIDEO_NOTIFY_PREV_OUTPUT  0x84
 
-#define ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS     0x82
-#define        ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS        0x83
-#define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS       0x84
-#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS      0x85
-#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF          0x86
-
+#define ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS     0x85
+#define        ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS        0x86
+#define ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS       0x87
+#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS      0x88
+#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF          0x89
 
 #define ACPI_VIDEO_HEAD_INVALID                (~0u - 1)
 #define ACPI_VIDEO_HEAD_END            (~0u)
 
-
 #define _COMPONENT             ACPI_VIDEO_COMPONENT
-ACPI_MODULE_NAME               ("acpi_video")
+ACPI_MODULE_NAME("acpi_video")
 
-MODULE_AUTHOR("Bruno Ducrot");
+    MODULE_AUTHOR("Bruno Ducrot");
 MODULE_DESCRIPTION(ACPI_VIDEO_DRIVER_NAME);
 MODULE_LICENSE("GPL");
 
-static int acpi_video_bus_add (struct acpi_device *device);
-static int acpi_video_bus_remove (struct acpi_device *device, int type);
-static int acpi_video_bus_match (struct acpi_device *device, struct acpi_driver *driver);
+static int acpi_video_bus_add(struct acpi_device *device);
+static int acpi_video_bus_remove(struct acpi_device *device, int type);
+static int acpi_video_bus_match(struct acpi_device *device,
+                               struct acpi_driver *driver);
 
 static struct acpi_driver acpi_video_bus = {
        .name = ACPI_VIDEO_DRIVER_NAME,
@@ -76,187 +76,191 @@ static struct acpi_driver acpi_video_bus = {
                .add = acpi_video_bus_add,
                .remove = acpi_video_bus_remove,
                .match = acpi_video_bus_match,
-       },
+               },
 };
 
 struct acpi_video_bus_flags {
-       u8      multihead:1;    /* can switch video heads */
-       u8      rom:1;          /* can retrieve a video rom */
-       u8      post:1;         /* can configure the head to */
-       u8      reserved:5;
+       u8 multihead:1;         /* can switch video heads */
+       u8 rom:1;               /* can retrieve a video rom */
+       u8 post:1;              /* can configure the head to */
+       u8 reserved:5;
 };
 
 struct acpi_video_bus_cap {
-       u8      _DOS:1; /*Enable/Disable output switching*/
-       u8      _DOD:1; /*Enumerate all devices attached to display adapter*/
-       u8      _ROM:1; /*Get ROM Data*/
-       u8      _GPD:1; /*Get POST Device*/
-       u8      _SPD:1; /*Set POST Device*/
-       u8      _VPO:1; /*Video POST Options*/
-       u8      reserved:2;
+       u8 _DOS:1;              /*Enable/Disable output switching */
+       u8 _DOD:1;              /*Enumerate all devices attached to display adapter */
+       u8 _ROM:1;              /*Get ROM Data */
+       u8 _GPD:1;              /*Get POST Device */
+       u8 _SPD:1;              /*Set POST Device */
+       u8 _VPO:1;              /*Video POST Options */
+       u8 reserved:2;
 };
 
-struct acpi_video_device_attrib{
-       u32     display_index:4; /* A zero-based instance of the Display*/
-       u32     display_port_attachment:4; /*This field differenates displays type*/
-       u32     display_type:4; /*Describe the specific type in use*/
-       u32     vendor_specific:4; /*Chipset Vendor Specifi*/ 
-       u32     bios_can_detect:1; /*BIOS can detect the device*/
-       u32     depend_on_vga:1; /*Non-VGA output device whose power is related to 
-                                  the VGA device.*/
-       u32     pipe_id:3; /*For VGA multiple-head devices.*/
-       u32     reserved:10; /*Must be 0*/
-       u32     device_id_scheme:1; /*Device ID Scheme*/
+struct acpi_video_device_attrib {
+       u32 display_index:4;    /* A zero-based instance of the Display */
+       u32 display_port_attachment:4;  /*This field differenates displays type */
+       u32 display_type:4;     /*Describe the specific type in use */
+       u32 vendor_specific:4;  /*Chipset Vendor Specifi */
+       u32 bios_can_detect:1;  /*BIOS can detect the device */
+       u32 depend_on_vga:1;    /*Non-VGA output device whose power is related to 
+                                  the VGA device. */
+       u32 pipe_id:3;          /*For VGA multiple-head devices. */
+       u32 reserved:10;        /*Must be 0 */
+       u32 device_id_scheme:1; /*Device ID Scheme */
 };
 
 struct acpi_video_enumerated_device {
        union {
                u32 int_val;
-               struct acpi_video_device_attrib attrib;
+               struct acpi_video_device_attrib attrib;
        } value;
        struct acpi_video_device *bind_info;
 };
 
 struct acpi_video_bus {
-       acpi_handle     handle;
-       u8      dos_setting;
+       struct acpi_device *device;
+       u8 dos_setting;
        struct acpi_video_enumerated_device *attached_array;
-       u8                      attached_count;
-       struct acpi_video_bus_cap       cap;
+       u8 attached_count;
+       struct acpi_video_bus_cap cap;
        struct acpi_video_bus_flags flags;
-       struct semaphore        sem;
-       struct list_head        video_device_list;
-       struct proc_dir_entry   *dir;
+       struct semaphore sem;
+       struct list_head video_device_list;
+       struct proc_dir_entry *dir;
 };
 
 struct acpi_video_device_flags {
-       u8      crt:1;
-       u8      lcd:1;
-       u8      tvout:1;
-       u8      bios:1;
-       u8      unknown:1;
-       u8      reserved:3;
+       u8 crt:1;
+       u8 lcd:1;
+       u8 tvout:1;
+       u8 bios:1;
+       u8 unknown:1;
+       u8 reserved:3;
 };
 
 struct acpi_video_device_cap {
-       u8      _ADR:1; /*Return the unique ID */
-       u8      _BCL:1; /*Query list of brightness control levels supported*/
-       u8      _BCM:1; /*Set the brightness level*/
-       u8      _DDC:1; /*Return the EDID for this device*/
-       u8      _DCS:1; /*Return status of output device*/
-       u8      _DGS:1; /*Query graphics state*/
-       u8      _DSS:1; /*Device state set*/
-       u8      _reserved:1;
+       u8 _ADR:1;              /*Return the unique ID */
+       u8 _BCL:1;              /*Query list of brightness control levels supported */
+       u8 _BCM:1;              /*Set the brightness level */
+       u8 _DDC:1;              /*Return the EDID for this device */
+       u8 _DCS:1;              /*Return status of output device */
+       u8 _DGS:1;              /*Query graphics state */
+       u8 _DSS:1;              /*Device state set */
+       u8 _reserved:1;
 };
 
 struct acpi_video_device_brightness {
-       int     curr;
-       int     count;
-       int     *levels;
+       int curr;
+       int count;
+       int *levels;
 };
 
 struct acpi_video_device {
-       acpi_handle             handle;
-       unsigned long           device_id;
-       struct acpi_video_device_flags  flags;
-       struct acpi_video_device_cap    cap;
-       struct list_head        entry;
-       struct acpi_video_bus   *video;
-       struct acpi_device      *dev;
+       unsigned long device_id;
+       struct acpi_video_device_flags flags;
+       struct acpi_video_device_cap cap;
+       struct list_head entry;
+       struct acpi_video_bus *video;
+       struct acpi_device *dev;
        struct acpi_video_device_brightness *brightness;
 };
 
-
 /* bus */
 static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_info_fops = {
-       .open           = acpi_video_bus_info_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_bus_info_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
 static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_ROM_fops = {
-       .open           = acpi_video_bus_ROM_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_bus_ROM_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
-static int acpi_video_bus_POST_info_open_fs(struct inode *inode, struct file *file);
+static int acpi_video_bus_POST_info_open_fs(struct inode *inode,
+                                           struct file *file);
 static struct file_operations acpi_video_bus_POST_info_fops = {
-       .open           = acpi_video_bus_POST_info_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_bus_POST_info_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
 static int acpi_video_bus_POST_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_POST_fops = {
-       .open           = acpi_video_bus_POST_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_bus_POST_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
-
 static int acpi_video_bus_DOS_open_fs(struct inode *inode, struct file *file);
 static struct file_operations acpi_video_bus_DOS_fops = {
-       .open           = acpi_video_bus_DOS_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_bus_DOS_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
 /* device */
-static int acpi_video_device_info_open_fs(struct inode *inode, struct file *file);
+static int acpi_video_device_info_open_fs(struct inode *inode,
+                                         struct file *file);
 static struct file_operations acpi_video_device_info_fops = {
-       .open           = acpi_video_device_info_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_device_info_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
-static int acpi_video_device_state_open_fs(struct inode *inode, struct file *file);
+static int acpi_video_device_state_open_fs(struct inode *inode,
+                                          struct file *file);
 static struct file_operations acpi_video_device_state_fops = {
-       .open           = acpi_video_device_state_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_device_state_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
-static int acpi_video_device_brightness_open_fs(struct inode *inode, struct file *file);
+static int acpi_video_device_brightness_open_fs(struct inode *inode,
+                                               struct file *file);
 static struct file_operations acpi_video_device_brightness_fops = {
-       .open           = acpi_video_device_brightness_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_device_brightness_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
-static int acpi_video_device_EDID_open_fs(struct inode *inode, struct file *file);
+static int acpi_video_device_EDID_open_fs(struct inode *inode,
+                                         struct file *file);
 static struct file_operations acpi_video_device_EDID_fops = {
-       .open           = acpi_video_device_EDID_open_fs,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+       .open = acpi_video_device_EDID_open_fs,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
 };
 
-static char    device_decode[][30] = {
+static char device_decode[][30] = {
        "motherboard VGA device",
        "PCI VGA device",
        "AGP VGA device",
        "UNKNOWN",
 };
 
-static void acpi_video_device_notify ( acpi_handle handle, u32 event, void *data);
-static void acpi_video_device_rebind( struct acpi_video_bus *video);
-static void acpi_video_device_bind( struct acpi_video_bus *video, struct acpi_video_device *device);
+static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data);
+static void acpi_video_device_rebind(struct acpi_video_bus *video);
+static void acpi_video_device_bind(struct acpi_video_bus *video,
+                                  struct acpi_video_device *device);
 static int acpi_video_device_enumerate(struct acpi_video_bus *video);
-static int acpi_video_switch_output( struct acpi_video_bus *video, int event);
-static int acpi_video_get_next_level( struct acpi_video_device *device, u32 level_current,u32 event);
-static void acpi_video_switch_brightness ( struct acpi_video_device *device, int event);
-
+static int acpi_video_switch_output(struct acpi_video_bus *video, int event);
+static int acpi_video_get_next_level(struct acpi_video_device *device,
+                                    u32 level_current, u32 event);
+static void acpi_video_switch_brightness(struct acpi_video_device *device,
+                                        int event);
 
 /* --------------------------------------------------------------------------
                                Video Management
@@ -265,206 +269,177 @@ static void acpi_video_switch_brightness ( struct acpi_video_device *device, int
 /* device */
 
 static int
-acpi_video_device_query (
-       struct acpi_video_device        *device,
-       unsigned long                   *state)
+acpi_video_device_query(struct acpi_video_device *device, unsigned long *state)
 {
-       int                     status;
-       ACPI_FUNCTION_TRACE("acpi_video_device_query");
-       status = acpi_evaluate_integer(device->handle, "_DGS", NULL, state);
+       int status;
+
+       status = acpi_evaluate_integer(device->dev->handle, "_DGS", NULL, state);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_device_get_state (
-       struct acpi_video_device        *device,
-       unsigned long           *state)
+acpi_video_device_get_state(struct acpi_video_device *device,
+                           unsigned long *state)
 {
-       int                     status;
-
-       ACPI_FUNCTION_TRACE("acpi_video_device_get_state");
+       int status;
 
-       status = acpi_evaluate_integer(device->handle, "_DCS", NULL, state);
+       status = acpi_evaluate_integer(device->dev->handle, "_DCS", NULL, state);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_device_set_state (
-       struct acpi_video_device        *device,
-       int                     state)
+acpi_video_device_set_state(struct acpi_video_device *device, int state)
 {
-       int                     status;
-       union acpi_object       arg0 = {ACPI_TYPE_INTEGER};
-       struct acpi_object_list args = {1, &arg0};
+       int status;
+       union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+       struct acpi_object_list args = { 1, &arg0 };
+       unsigned long ret;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_set_state");
 
        arg0.integer.value = state;
-       status = acpi_evaluate_integer(device->handle, "_DSS", &args, NULL);
+       status = acpi_evaluate_integer(device->dev->handle, "_DSS", &args, &ret);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_device_lcd_query_levels (
-       struct acpi_video_device        *device,
-       union acpi_object               **levels)
+acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
+                                  union acpi_object **levels)
 {
-       int                     status;
-       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       union acpi_object       *obj;
-
+       int status;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *obj;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_lcd_query_levels");
 
        *levels = NULL;
 
-       status = acpi_evaluate_object(device->handle, "_BCL", NULL, &buffer);
+       status = acpi_evaluate_object(device->dev->handle, "_BCL", NULL, &buffer);
        if (!ACPI_SUCCESS(status))
-               return_VALUE(status);
-       obj = (union acpi_object *) buffer.pointer;
-       if (!obj && (obj->type != ACPI_TYPE_PACKAGE)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _BCL data\n"));
+               return status;
+       obj = (union acpi_object *)buffer.pointer;
+       if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
+               printk(KERN_ERR PREFIX "Invalid _BCL data\n");
                status = -EFAULT;
                goto err;
        }
 
        *levels = obj;
 
-       return_VALUE(0);
+       return 0;
 
-err:
-       if (buffer.pointer)
-               kfree(buffer.pointer);
+      err:
+       kfree(buffer.pointer);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_device_lcd_set_level (
-       struct acpi_video_device        *device,
-       int                             level)
+acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
 {
-       int                     status;
-       union acpi_object       arg0 = {ACPI_TYPE_INTEGER};
-       struct acpi_object_list args = {1, &arg0};
+       int status;
+       union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+       struct acpi_object_list args = { 1, &arg0 };
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_lcd_set_level");
 
        arg0.integer.value = level;
-       status = acpi_evaluate_object(device->handle, "_BCM", &args, NULL);
+       status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 
        printk(KERN_DEBUG "set_level status: %x\n", status);
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_device_lcd_get_level_current (
-       struct acpi_video_device        *device,
-       unsigned long   *level)
+acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
+                                       unsigned long *level)
 {
-       int                     status;
-       ACPI_FUNCTION_TRACE("acpi_video_device_lcd_get_level_current");
+       int status;
 
-       status = acpi_evaluate_integer(device->handle, "_BQC", NULL, level);
+       status = acpi_evaluate_integer(device->dev->handle, "_BQC", NULL, level);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_device_EDID (
-       struct acpi_video_device        *device,
-       union acpi_object               **edid,
-       ssize_t                         length)
+acpi_video_device_EDID(struct acpi_video_device *device,
+                      union acpi_object **edid, ssize_t length)
 {
-       int                     status;
-       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       union acpi_object       *obj;
-       union acpi_object       arg0 = {ACPI_TYPE_INTEGER};
-       struct acpi_object_list args = {1, &arg0};
+       int status;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *obj;
+       union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+       struct acpi_object_list args = { 1, &arg0 };
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_get_EDID");
 
        *edid = NULL;
 
        if (!device)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        if (length == 128)
                arg0.integer.value = 1;
        else if (length == 256)
                arg0.integer.value = 2;
        else
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
-       status = acpi_evaluate_object(device->handle, "_DDC", &args, &buffer);
+       status = acpi_evaluate_object(device->dev->handle, "_DDC", &args, &buffer);
        if (ACPI_FAILURE(status))
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
-       obj = (union acpi_object *) buffer.pointer;
+       obj = buffer.pointer;
 
        if (obj && obj->type == ACPI_TYPE_BUFFER)
                *edid = obj;
        else {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _DDC data\n"));
+               printk(KERN_ERR PREFIX "Invalid _DDC data\n");
                status = -EFAULT;
                kfree(obj);
        }
 
-       return_VALUE(status);
+       return status;
 }
 
-
 /* bus */
 
 static int
-acpi_video_bus_set_POST (
-       struct acpi_video_bus   *video,
-       unsigned long           option)
+acpi_video_bus_set_POST(struct acpi_video_bus *video, unsigned long option)
 {
-       int                     status;
-       unsigned long           tmp;
-       union acpi_object       arg0 = {ACPI_TYPE_INTEGER};
-       struct acpi_object_list args = {1, &arg0};
+       int status;
+       unsigned long tmp;
+       union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+       struct acpi_object_list args = { 1, &arg0 };
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_set_POST");
 
        arg0.integer.value = option;
 
-       status = acpi_evaluate_integer(video->handle, "_SPD", &args, &tmp);
+       status = acpi_evaluate_integer(video->device->handle, "_SPD", &args, &tmp);
        if (ACPI_SUCCESS(status))
-               status = tmp ? (-EINVAL):(AE_OK);
+               status = tmp ? (-EINVAL) : (AE_OK);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_bus_get_POST (
-       struct acpi_video_bus   *video,
-       unsigned long           *id)
+acpi_video_bus_get_POST(struct acpi_video_bus *video, unsigned long *id)
 {
        int status;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_get_POST");
-
-       status = acpi_evaluate_integer(video->handle, "_GPD", NULL, id);
+       status = acpi_evaluate_integer(video->device->handle, "_GPD", NULL, id);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
-acpi_video_bus_POST_options (
-       struct acpi_video_bus   *video,
-       unsigned long           *options)
+acpi_video_bus_POST_options(struct acpi_video_bus *video,
+                           unsigned long *options)
 {
-       int                     status;
-       ACPI_FUNCTION_TRACE("acpi_video_bus_POST_options");
+       int status;
 
-       status = acpi_evaluate_integer(video->handle, "_VPO", NULL, options);
+       status = acpi_evaluate_integer(video->device->handle, "_VPO", NULL, options);
        *options &= 3;
 
-       return_VALUE(status);
+       return status;
 }
 
 /*
@@ -489,27 +464,23 @@ acpi_video_bus_POST_options (
  */
 
 static int
-acpi_video_bus_DOS(
-       struct acpi_video_bus   *video,
-       int                     bios_flag,
-       int                     lcd_flag)
+acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 {
-       acpi_integer            status = 0;
-       union acpi_object       arg0 = {ACPI_TYPE_INTEGER};
-       struct acpi_object_list args = {1, &arg0};
+       acpi_integer status = 0;
+       union acpi_object arg0 = { ACPI_TYPE_INTEGER };
+       struct acpi_object_list args = { 1, &arg0 };
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_DOS");
 
-       if (bios_flag < 0 || bios_flag >3 || lcd_flag < 0 || lcd_flag > 1){
+       if (bios_flag < 0 || bios_flag > 3 || lcd_flag < 0 || lcd_flag > 1) {
                status = -1;
                goto Failed;
        }
        arg0.integer.value = (lcd_flag << 2) | bios_flag;
        video->dos_setting = arg0.integer.value;
-       acpi_evaluate_object(video->handle, "_DOS", &args, NULL);
+       acpi_evaluate_object(video->device->handle, "_DOS", &args, NULL);
 
-Failed:
-       return_VALUE(status);
+      Failed:
+       return status;
 }
 
 /*
@@ -523,38 +494,36 @@ Failed:
  *  device.
  */
 
-static void
-acpi_video_device_find_cap (struct acpi_video_device *device)
+static void acpi_video_device_find_cap(struct acpi_video_device *device)
 {
-       acpi_integer            status;
+       acpi_integer status;
        acpi_handle h_dummy1;
        int i;
        union acpi_object *obj = NULL;
        struct acpi_video_device_brightness *br = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_find_cap");
 
-       memset( &device->cap, 0, 4);
+       memset(&device->cap, 0, 4);
 
-       if( ACPI_SUCCESS(acpi_get_handle(device->handle, "_ADR", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_ADR", &h_dummy1))) {
                device->cap._ADR = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(device->handle, "_BCL", &h_dummy1))) {
-               device->cap._BCL= 1;
+       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BCL", &h_dummy1))) {
+               device->cap._BCL = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(device->handle, "_BCM", &h_dummy1))) {
-               device->cap._BCM= 1;
+       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BCM", &h_dummy1))) {
+               device->cap._BCM = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(device->handle, "_DDC", &h_dummy1))) {
-               device->cap._DDC= 1;
+       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
+               device->cap._DDC = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(device->handle, "_DCS", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DCS", &h_dummy1))) {
                device->cap._DCS = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(device->handle, "_DGS", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DGS", &h_dummy1))) {
                device->cap._DGS = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(device->handle, "_DSS", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DSS", &h_dummy1))) {
                device->cap._DSS = 1;
        }
 
@@ -563,41 +532,43 @@ acpi_video_device_find_cap (struct acpi_video_device *device)
        if (obj && obj->type == ACPI_TYPE_PACKAGE && obj->package.count >= 2) {
                int count = 0;
                union acpi_object *o;
-               
-               br = kmalloc(sizeof(*br), GFP_KERNEL);
+
+               br = kzalloc(sizeof(*br), GFP_KERNEL);
                if (!br) {
                        printk(KERN_ERR "can't allocate memory\n");
                } else {
-                       memset(br, 0, sizeof(*br));
                        br->levels = kmalloc(obj->package.count *
-                                       sizeof *(br->levels), GFP_KERNEL);
+                                            sizeof *(br->levels), GFP_KERNEL);
                        if (!br->levels)
                                goto out;
 
                        for (i = 0; i < obj->package.count; i++) {
-                               o = (union acpi_object *) &obj->package.elements[i];
+                               o = (union acpi_object *)&obj->package.
+                                   elements[i];
                                if (o->type != ACPI_TYPE_INTEGER) {
-                                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data\n"));
+                                       printk(KERN_ERR PREFIX "Invalid data\n");
                                        continue;
                                }
                                br->levels[count] = (u32) o->integer.value;
                                count++;
                        }
-out:
+                     out:
                        if (count < 2) {
                                kfree(br->levels);
                                kfree(br);
                        } else {
                                br->count = count;
                                device->brightness = br;
-                               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "found %d brightness levels\n", count));
+                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                                 "found %d brightness levels\n",
+                                                 count));
                        }
                }
        }
 
        kfree(obj);
 
-       return_VOID;
+       return;
 }
 
 /*
@@ -610,28 +581,27 @@ out:
  *  Find out all required AML method defined under the video bus device.
  */
 
-static void 
-acpi_video_bus_find_cap (struct acpi_video_bus *video)
+static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
 {
-       acpi_handle     h_dummy1;
+       acpi_handle h_dummy1;
 
-       memset(&video->cap ,0, 4);
-       if( ACPI_SUCCESS(acpi_get_handle(video->handle, "_DOS", &h_dummy1))) {
+       memset(&video->cap, 0, 4);
+       if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOS", &h_dummy1))) {
                video->cap._DOS = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(video->handle, "_DOD", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOD", &h_dummy1))) {
                video->cap._DOD = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(video->handle, "_ROM", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_ROM", &h_dummy1))) {
                video->cap._ROM = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(video->handle, "_GPD", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_GPD", &h_dummy1))) {
                video->cap._GPD = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(video->handle, "_SPD", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_SPD", &h_dummy1))) {
                video->cap._SPD = 1;
        }
-       if( ACPI_SUCCESS(acpi_get_handle(video->handle, "_VPO", &h_dummy1))) {
+       if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_VPO", &h_dummy1))) {
                video->cap._VPO = 1;
        }
 }
@@ -641,59 +611,51 @@ acpi_video_bus_find_cap (struct acpi_video_bus *video)
  * support the desired features
  */
 
-static int
-acpi_video_bus_check (
-       struct acpi_video_bus   *video)
+static int acpi_video_bus_check(struct acpi_video_bus *video)
 {
-       acpi_status             status = -ENOENT;
-
+       acpi_status status = -ENOENT;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_check");
 
        if (!video)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        /* Since there is no HID, CID and so on for VGA driver, we have
         * to check well known required nodes.
         */
 
        /* Does this device able to support video switching ? */
-       if(video->cap._DOS){
+       if (video->cap._DOS) {
                video->flags.multihead = 1;
                status = 0;
        }
 
        /* Does this device able to retrieve a retrieve a video ROM ? */
-       if(video->cap._ROM){
+       if (video->cap._ROM) {
                video->flags.rom = 1;
                status = 0;
        }
 
        /* Does this device able to configure which video device to POST ? */
-       if(video->cap._GPD && video->cap._SPD && video->cap._VPO){
+       if (video->cap._GPD && video->cap._SPD && video->cap._VPO) {
                video->flags.post = 1;
                status = 0;
        }
 
-       return_VALUE(status);
+       return status;
 }
 
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
 
-static struct proc_dir_entry   *acpi_video_dir;
+static struct proc_dir_entry *acpi_video_dir;
 
 /* video devices */
 
-static int
-acpi_video_device_info_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_device_info_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_device        *dev = (struct acpi_video_device *) seq->private;
+       struct acpi_video_device *dev = seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_info_seq_show");
 
        if (!dev)
                goto end;
@@ -709,32 +671,25 @@ acpi_video_device_info_seq_show (
        else
                seq_printf(seq, "UNKNOWN\n");
 
-       seq_printf(seq,"known by bios: %s\n",
-                  dev->flags.bios ? "yes":"no");
+       seq_printf(seq, "known by bios: %s\n", dev->flags.bios ? "yes" : "no");
 
-end:
-       return_VALUE(0);
+      end:
+       return 0;
 }
 
 static int
-acpi_video_device_info_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+acpi_video_device_info_open_fs(struct inode *inode, struct file *file)
 {
        return single_open(file, acpi_video_device_info_seq_show,
                           PDE(inode)->data);
 }
 
-static int  
-acpi_video_device_state_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)
 {
-       int                     status;
-       struct acpi_video_device        *dev = (struct acpi_video_device *) seq->private;
-       unsigned long   state;
+       int status;
+       struct acpi_video_device *dev = seq->private;
+       unsigned long state;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_state_seq_show");
 
        if (!dev)
                goto end;
@@ -753,65 +708,57 @@ acpi_video_device_state_seq_show (
        else
                seq_printf(seq, "<not supported>\n");
 
-end:
-       return_VALUE(0);
+      end:
+       return 0;
 }
 
 static int
-acpi_video_device_state_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+acpi_video_device_state_open_fs(struct inode *inode, struct file *file)
 {
        return single_open(file, acpi_video_device_state_seq_show,
                           PDE(inode)->data);
 }
 
 static ssize_t
-acpi_video_device_write_state (
-       struct file             *file,
-       const char              __user *buffer,
-       size_t                  count,
-       loff_t                  *data)
+acpi_video_device_write_state(struct file *file,
+                             const char __user * buffer,
+                             size_t count, loff_t * data)
 {
-       int                     status;
-       struct seq_file         *m = (struct seq_file *) file->private_data;
-       struct acpi_video_device        *dev = (struct acpi_video_device *) m->private;
-       char                    str[12] = {0};
-       u32                     state = 0;
+       int status;
+       struct seq_file *m = file->private_data;
+       struct acpi_video_device *dev = m->private;
+       char str[12] = { 0 };
+       u32 state = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_write_state");
 
        if (!dev || count + 1 > sizeof str)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (copy_from_user(str, buffer, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        str[count] = 0;
        state = simple_strtoul(str, NULL, 0);
-       state &= ((1ul<<31) | (1ul<<30) | (1ul<<0));
+       state &= ((1ul << 31) | (1ul << 30) | (1ul << 0));
 
        status = acpi_video_device_set_state(dev, state);
 
        if (status)
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
-       return_VALUE(count);
+       return count;
 }
 
 static int
-acpi_video_device_brightness_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_device        *dev = (struct acpi_video_device *) seq->private;
-       int                     i;
+       struct acpi_video_device *dev = seq->private;
+       int i;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_brightness_seq_show");
 
        if (!dev || !dev->brightness) {
                seq_printf(seq, "<not supported>\n");
-               return_VALUE(0);
+               return 0;
        }
 
        seq_printf(seq, "levels: ");
@@ -819,74 +766,66 @@ acpi_video_device_brightness_seq_show (
                seq_printf(seq, " %d", dev->brightness->levels[i]);
        seq_printf(seq, "\ncurrent: %d\n", dev->brightness->curr);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int
-acpi_video_device_brightness_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+acpi_video_device_brightness_open_fs(struct inode *inode, struct file *file)
 {
        return single_open(file, acpi_video_device_brightness_seq_show,
                           PDE(inode)->data);
 }
 
 static ssize_t
-acpi_video_device_write_brightness (
-       struct file             *file,
-       const char              __user *buffer,
-       size_t                  count,
-       loff_t                  *data)
+acpi_video_device_write_brightness(struct file *file,
+                                  const char __user * buffer,
+                                  size_t count, loff_t * data)
 {
-       struct seq_file         *m = (struct seq_file *) file->private_data;
-       struct acpi_video_device        *dev = (struct acpi_video_device *) m->private;
-       char                    str[4] = {0};
-       unsigned int            level = 0;
-       int                     i;
+       struct seq_file *m = file->private_data;
+       struct acpi_video_device *dev = m->private;
+       char str[4] = { 0 };
+       unsigned int level = 0;
+       int i;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
 
-       if (!dev || count + 1 > sizeof str)
-               return_VALUE(-EINVAL);
+       if (!dev || !dev->brightness || count + 1 > sizeof str)
+               return -EINVAL;
 
        if (copy_from_user(str, buffer, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        str[count] = 0;
        level = simple_strtoul(str, NULL, 0);
-       
+
        if (level > 100)
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        /* validate though the list of available levels */
        for (i = 0; i < dev->brightness->count; i++)
                if (level == dev->brightness->levels[i]) {
-                       if (ACPI_SUCCESS(acpi_video_device_lcd_set_level(dev, level)))
+                       if (ACPI_SUCCESS
+                           (acpi_video_device_lcd_set_level(dev, level)))
                                dev->brightness->curr = level;
                        break;
                }
 
-       return_VALUE(count);
+       return count;
 }
 
-static int
-acpi_video_device_EDID_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_device        *dev = (struct acpi_video_device *) seq->private;
-       int                     status;
-       int                     i;
-       union acpi_object       *edid = NULL;
+       struct acpi_video_device *dev = seq->private;
+       int status;
+       int i;
+       union acpi_object *edid = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_EDID_seq_show");
 
        if (!dev)
                goto out;
 
-       status = acpi_video_device_EDID (dev, &edid, 128);
+       status = acpi_video_device_EDID(dev, &edid, 128);
        if (ACPI_FAILURE(status)) {
-               status = acpi_video_device_EDID (dev, &edid, 256);
+               status = acpi_video_device_EDID(dev, &edid, 256);
        }
 
        if (ACPI_FAILURE(status)) {
@@ -898,54 +837,47 @@ acpi_video_device_EDID_seq_show (
                        seq_putc(seq, edid->buffer.pointer[i]);
        }
 
-out:
+      out:
        if (!edid)
                seq_printf(seq, "<not supported>\n");
        else
                kfree(edid);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int
-acpi_video_device_EDID_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+acpi_video_device_EDID_open_fs(struct inode *inode, struct file *file)
 {
        return single_open(file, acpi_video_device_EDID_seq_show,
                           PDE(inode)->data);
 }
 
-
-static int
-acpi_video_device_add_fs (
-       struct acpi_device      *device)
+static int acpi_video_device_add_fs(struct acpi_device *device)
 {
-       struct proc_dir_entry   *entry = NULL;
+       struct proc_dir_entry *entry = NULL;
        struct acpi_video_device *vid_dev;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_add_fs");
 
        if (!device)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
-       vid_dev = (struct acpi_video_device *) acpi_driver_data(device);
+       vid_dev = acpi_driver_data(device);
        if (!vid_dev)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
        if (!acpi_device_dir(device)) {
                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                               vid_dev->video->dir);
+                                                    vid_dev->video->dir);
                if (!acpi_device_dir(device))
-                       return_VALUE(-ENODEV);
+                       return -ENODEV;
                acpi_device_dir(device)->owner = THIS_MODULE;
        }
 
        /* 'info' [R] */
        entry = create_proc_entry("info", S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to create 'info' fs entry\n"));
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_video_device_info_fops;
                entry->data = acpi_driver_data(device);
@@ -953,25 +885,27 @@ acpi_video_device_add_fs (
        }
 
        /* 'state' [R/W] */
-       entry = create_proc_entry("state", S_IFREG|S_IRUGO|S_IWUSR, acpi_device_dir(device));
+       entry =
+           create_proc_entry("state", S_IFREG | S_IRUGO | S_IWUSR,
+                             acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to create 'state' fs entry\n"));
+               return -ENODEV;
        else {
+               acpi_video_device_state_fops.write = acpi_video_device_write_state;
                entry->proc_fops = &acpi_video_device_state_fops;
-               entry->proc_fops->write = acpi_video_device_write_state;
                entry->data = acpi_driver_data(device);
                entry->owner = THIS_MODULE;
        }
 
        /* 'brightness' [R/W] */
-       entry = create_proc_entry("brightness", S_IFREG|S_IRUGO|S_IWUSR, acpi_device_dir(device));
+       entry =
+           create_proc_entry("brightness", S_IFREG | S_IRUGO | S_IWUSR,
+                             acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to create 'brightness' fs entry\n"));
+               return -ENODEV;
        else {
+               acpi_video_device_brightness_fops.write = acpi_video_device_write_brightness;
                entry->proc_fops = &acpi_video_device_brightness_fops;
-               entry->proc_fops->write = acpi_video_device_write_brightness;
                entry->data = acpi_driver_data(device);
                entry->owner = THIS_MODULE;
        }
@@ -979,82 +913,66 @@ acpi_video_device_add_fs (
        /* 'EDID' [R] */
        entry = create_proc_entry("EDID", S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to create 'brightness' fs entry\n"));
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_video_device_EDID_fops;
                entry->data = acpi_driver_data(device);
                entry->owner = THIS_MODULE;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
-static int
-acpi_video_device_remove_fs (
-       struct acpi_device      *device)
+static int acpi_video_device_remove_fs(struct acpi_device *device)
 {
        struct acpi_video_device *vid_dev;
-       ACPI_FUNCTION_TRACE("acpi_video_device_remove_fs");
 
-       vid_dev = (struct acpi_video_device *) acpi_driver_data(device);
+       vid_dev = acpi_driver_data(device);
        if (!vid_dev || !vid_dev->video || !vid_dev->video->dir)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
        if (acpi_device_dir(device)) {
                remove_proc_entry("info", acpi_device_dir(device));
                remove_proc_entry("state", acpi_device_dir(device));
                remove_proc_entry("brightness", acpi_device_dir(device));
                remove_proc_entry("EDID", acpi_device_dir(device));
-               remove_proc_entry(acpi_device_bid(device),
-                                vid_dev->video->dir);
+               remove_proc_entry(acpi_device_bid(device), vid_dev->video->dir);
                acpi_device_dir(device) = NULL;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
-
 /* video bus */
-static int
-acpi_video_bus_info_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_bus_info_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) seq->private;
+       struct acpi_video_bus *video = seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_info_seq_show");
 
        if (!video)
                goto end;
 
        seq_printf(seq, "Switching heads:              %s\n",
-                       video->flags.multihead ? "yes":"no");
+                  video->flags.multihead ? "yes" : "no");
        seq_printf(seq, "Video ROM:                    %s\n",
-                       video->flags.rom ? "yes":"no");
+                  video->flags.rom ? "yes" : "no");
        seq_printf(seq, "Device to be POSTed on boot:  %s\n",
-                       video->flags.post ? "yes":"no");
+                  video->flags.post ? "yes" : "no");
 
-end:
-       return_VALUE(0);
+      end:
+       return 0;
 }
 
-static int
-acpi_video_bus_info_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file)
 {
-       return single_open(file, acpi_video_bus_info_seq_show, PDE(inode)->data);
+       return single_open(file, acpi_video_bus_info_seq_show,
+                          PDE(inode)->data);
 }
 
-static int
-acpi_video_bus_ROM_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) seq->private;
+       struct acpi_video_bus *video = seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_ROM_seq_show");
 
        if (!video)
                goto end;
@@ -1062,28 +980,21 @@ acpi_video_bus_ROM_seq_show (
        printk(KERN_INFO PREFIX "Please implement %s\n", __FUNCTION__);
        seq_printf(seq, "<TODO>\n");
 
-end:
-       return_VALUE(0);
+      end:
+       return 0;
 }
 
-static int
-acpi_video_bus_ROM_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)
 {
        return single_open(file, acpi_video_bus_ROM_seq_show, PDE(inode)->data);
 }
 
-static int
-acpi_video_bus_POST_info_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) seq->private;
-       unsigned long           options;
-       int                     status;
+       struct acpi_video_bus *video = seq->private;
+       unsigned long options;
+       int status;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_POST_info_seq_show");
 
        if (!video)
                goto end;
@@ -1091,8 +1002,10 @@ acpi_video_bus_POST_info_seq_show (
        status = acpi_video_bus_POST_options(video, &options);
        if (ACPI_SUCCESS(status)) {
                if (!(options & 1)) {
-                       printk(KERN_WARNING PREFIX "The motherboard VGA device is not listed as a possible POST device.\n");
-                       printk(KERN_WARNING PREFIX "This indicate a BIOS bug.  Please contact the manufacturer.\n");
+                       printk(KERN_WARNING PREFIX
+                              "The motherboard VGA device is not listed as a possible POST device.\n");
+                       printk(KERN_WARNING PREFIX
+                              "This indicate a BIOS bug.  Please contact the manufacturer.\n");
                }
                printk("%lx\n", options);
                seq_printf(seq, "can POST: <intgrated video>");
@@ -1103,169 +1016,143 @@ acpi_video_bus_POST_info_seq_show (
                seq_putc(seq, '\n');
        } else
                seq_printf(seq, "<not supported>\n");
-end:
-       return_VALUE(0);
+      end:
+       return 0;
 }
 
 static int
-acpi_video_bus_POST_info_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+acpi_video_bus_POST_info_open_fs(struct inode *inode, struct file *file)
 {
-       return single_open(file, acpi_video_bus_POST_info_seq_show, PDE(inode)->data);
+       return single_open(file, acpi_video_bus_POST_info_seq_show,
+                          PDE(inode)->data);
 }
 
-static int
-acpi_video_bus_POST_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) seq->private;
-       int                     status;
-       unsigned long           id;
+       struct acpi_video_bus *video = seq->private;
+       int status;
+       unsigned long id;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_POST_seq_show");
 
        if (!video)
                goto end;
 
-       status = acpi_video_bus_get_POST (video, &id);
+       status = acpi_video_bus_get_POST(video, &id);
        if (!ACPI_SUCCESS(status)) {
                seq_printf(seq, "<not supported>\n");
                goto end;
        }
-       seq_printf(seq, "device posted is <%s>\n",  device_decode[id & 3]);
+       seq_printf(seq, "device posted is <%s>\n", device_decode[id & 3]);
 
-end:
-       return_VALUE(0);
+      end:
+       return 0;
 }
 
-static int
-acpi_video_bus_DOS_seq_show (
-       struct seq_file         *seq,
-       void                    *offset)
+static int acpi_video_bus_DOS_seq_show(struct seq_file *seq, void *offset)
 {
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) seq->private;
+       struct acpi_video_bus *video = seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_DOS_seq_show");
 
-       seq_printf(seq, "DOS setting: <%d>\n", video->dos_setting );
+       seq_printf(seq, "DOS setting: <%d>\n", video->dos_setting);
 
-       return_VALUE(0);
+       return 0;
 }
 
-static int
-acpi_video_bus_POST_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+static int acpi_video_bus_POST_open_fs(struct inode *inode, struct file *file)
 {
-       return single_open(file, acpi_video_bus_POST_seq_show, PDE(inode)->data);
+       return single_open(file, acpi_video_bus_POST_seq_show,
+                          PDE(inode)->data);
 }
 
-static int
-acpi_video_bus_DOS_open_fs (
-       struct inode            *inode,
-       struct file             *file)
+static int acpi_video_bus_DOS_open_fs(struct inode *inode, struct file *file)
 {
        return single_open(file, acpi_video_bus_DOS_seq_show, PDE(inode)->data);
 }
 
 static ssize_t
-acpi_video_bus_write_POST (
-       struct file             *file,
-       const char              __user *buffer,
-       size_t                  count,
-       loff_t                  *data)
+acpi_video_bus_write_POST(struct file *file,
+                         const char __user * buffer,
+                         size_t count, loff_t * data)
 {
-       int                     status;
-       struct seq_file         *m = (struct seq_file *) file->private_data;
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) m->private;
-       char                    str[12] = {0};
-       unsigned long           opt, options;
-
-       ACPI_FUNCTION_TRACE("acpi_video_bus_write_POST");
+       int status;
+       struct seq_file *m = file->private_data;
+       struct acpi_video_bus *video = m->private;
+       char str[12] = { 0 };
+       unsigned long opt, options;
 
 
        if (!video || count + 1 > sizeof str)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        status = acpi_video_bus_POST_options(video, &options);
        if (!ACPI_SUCCESS(status))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (copy_from_user(str, buffer, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        str[count] = 0;
        opt = strtoul(str, NULL, 0);
        if (opt > 3)
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        /* just in case an OEM 'forget' the motherboard... */
        options |= 1;
 
        if (options & (1ul << opt)) {
-               status = acpi_video_bus_set_POST (video, opt);
+               status = acpi_video_bus_set_POST(video, opt);
                if (!ACPI_SUCCESS(status))
-                       return_VALUE(-EFAULT);
+                       return -EFAULT;
 
        }
 
-
-       return_VALUE(count);
+       return count;
 }
 
 static ssize_t
-acpi_video_bus_write_DOS (
-       struct file             *file,
-       const char              __user *buffer,
-       size_t                  count,
-       loff_t                  *data)
+acpi_video_bus_write_DOS(struct file *file,
+                        const char __user * buffer,
+                        size_t count, loff_t * data)
 {
-       int                     status;
-       struct seq_file         *m = (struct seq_file *) file->private_data;
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) m->private;
-       char                    str[12] = {0};
-       unsigned long           opt;
-
-       ACPI_FUNCTION_TRACE("acpi_video_bus_write_DOS");
+       int status;
+       struct seq_file *m = file->private_data;
+       struct acpi_video_bus *video = m->private;
+       char str[12] = { 0 };
+       unsigned long opt;
 
 
        if (!video || count + 1 > sizeof str)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (copy_from_user(str, buffer, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        str[count] = 0;
        opt = strtoul(str, NULL, 0);
        if (opt > 7)
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
-       status = acpi_video_bus_DOS (video, opt & 0x3, (opt & 0x4)>>2);
+       status = acpi_video_bus_DOS(video, opt & 0x3, (opt & 0x4) >> 2);
 
        if (!ACPI_SUCCESS(status))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
-       return_VALUE(count);
+       return count;
 }
 
-static int
-acpi_video_bus_add_fs (
-       struct acpi_device      *device)
+static int acpi_video_bus_add_fs(struct acpi_device *device)
 {
-       struct proc_dir_entry   *entry = NULL;
-       struct acpi_video_bus   *video;
+       struct proc_dir_entry *entry = NULL;
+       struct acpi_video_bus *video;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_add_fs");
 
-       video = (struct acpi_video_bus *) acpi_driver_data(device);
+       video = acpi_driver_data(device);
 
        if (!acpi_device_dir(device)) {
                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                               acpi_video_dir);
+                                                    acpi_video_dir);
                if (!acpi_device_dir(device))
-                       return_VALUE(-ENODEV);
+                       return -ENODEV;
                video->dir = acpi_device_dir(device);
                acpi_device_dir(device)->owner = THIS_MODULE;
        }
@@ -1273,7 +1160,7 @@ acpi_video_bus_add_fs (
        /* 'info' [R] */
        entry = create_proc_entry("info", S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to create 'info' fs entry\n"));
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_video_bus_info_fops;
                entry->data = acpi_driver_data(device);
@@ -1283,7 +1170,7 @@ acpi_video_bus_add_fs (
        /* 'ROM' [R] */
        entry = create_proc_entry("ROM", S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to create 'ROM' fs entry\n"));
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_video_bus_ROM_fops;
                entry->data = acpi_driver_data(device);
@@ -1291,9 +1178,10 @@ acpi_video_bus_add_fs (
        }
 
        /* 'POST_info' [R] */
-       entry = create_proc_entry("POST_info", S_IRUGO, acpi_device_dir(device));
+       entry =
+           create_proc_entry("POST_info", S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to create 'POST_info' fs entry\n"));
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_video_bus_POST_info_fops;
                entry->data = acpi_driver_data(device);
@@ -1301,39 +1189,40 @@ acpi_video_bus_add_fs (
        }
 
        /* 'POST' [R/W] */
-       entry = create_proc_entry("POST", S_IFREG|S_IRUGO|S_IRUSR, acpi_device_dir(device));
+       entry =
+           create_proc_entry("POST", S_IFREG | S_IRUGO | S_IRUSR,
+                             acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to create 'POST' fs entry\n"));
+               return -ENODEV;
        else {
+               acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
                entry->proc_fops = &acpi_video_bus_POST_fops;
-               entry->proc_fops->write = acpi_video_bus_write_POST;
                entry->data = acpi_driver_data(device);
                entry->owner = THIS_MODULE;
        }
 
        /* 'DOS' [R/W] */
-       entry = create_proc_entry("DOS", S_IFREG|S_IRUGO|S_IRUSR, acpi_device_dir(device));
+       entry =
+           create_proc_entry("DOS", S_IFREG | S_IRUGO | S_IRUSR,
+                             acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to create 'DOS' fs entry\n"));
+               return -ENODEV;
        else {
+               acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
                entry->proc_fops = &acpi_video_bus_DOS_fops;
-               entry->proc_fops->write = acpi_video_bus_write_DOS;
                entry->data = acpi_driver_data(device);
                entry->owner = THIS_MODULE;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
-static int
-acpi_video_bus_remove_fs (
-       struct acpi_device      *device)
+static int acpi_video_bus_remove_fs(struct acpi_device *device)
 {
-       struct acpi_video_bus   *video;
+       struct acpi_video_bus *video;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_remove_fs");
 
-       video = (struct acpi_video_bus *) acpi_driver_data(device);
+       video = acpi_driver_data(device);
 
        if (acpi_device_dir(device)) {
                remove_proc_entry("info", acpi_device_dir(device));
@@ -1341,12 +1230,11 @@ acpi_video_bus_remove_fs (
                remove_proc_entry("POST_info", acpi_device_dir(device));
                remove_proc_entry("POST", acpi_device_dir(device));
                remove_proc_entry("DOS", acpi_device_dir(device));
-               remove_proc_entry(acpi_device_bid(device),
-                               acpi_video_dir); 
+               remove_proc_entry(acpi_device_bid(device), acpi_video_dir);
                acpi_device_dir(device) = NULL;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 /* --------------------------------------------------------------------------
@@ -1356,29 +1244,25 @@ acpi_video_bus_remove_fs (
 /* device interface */
 
 static int
-acpi_video_bus_get_one_device (
-       struct acpi_device      *device,
-       struct acpi_video_bus   *video)
+acpi_video_bus_get_one_device(struct acpi_device *device,
+                             struct acpi_video_bus *video)
 {
-       unsigned long           device_id;
-       int                     status, result;
-       struct acpi_video_device        *data;
+       unsigned long device_id;
+       int status;
+       struct acpi_video_device *data;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_get_one_device");
 
        if (!device || !video)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
-       status = acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
+       status =
+           acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
        if (ACPI_SUCCESS(status)) {
 
-               data = kmalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
+               data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
                if (!data)
-                       return_VALUE(-ENOMEM);
-
-               memset(data, 0, sizeof(struct acpi_video_device));
+                       return -ENOMEM;
 
-               data->handle = device->handle;
                strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
                strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
                acpi_driver_data(device) = data;
@@ -1401,17 +1285,22 @@ acpi_video_bus_get_one_device (
                        data->flags.unknown = 1;
                        break;
                }
-               
+
                acpi_video_device_bind(video, data);
                acpi_video_device_find_cap(data);
 
-               status = acpi_install_notify_handler(data->handle,
-                       ACPI_DEVICE_NOTIFY, acpi_video_device_notify, data);
+               status = acpi_install_notify_handler(device->handle,
+                                                    ACPI_DEVICE_NOTIFY,
+                                                    acpi_video_device_notify,
+                                                    data);
                if (ACPI_FAILURE(status)) {
                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                               "Error installing notify handler\n"));
-                       result = -ENODEV;
-                       goto end;
+                                         "Error installing notify handler\n"));
+                       if(data->brightness)
+                               kfree(data->brightness->levels);
+                       kfree(data->brightness);
+                       kfree(data);
+                       return -ENODEV;
                }
 
                down(&video->sem);
@@ -1420,11 +1309,10 @@ acpi_video_bus_get_one_device (
 
                acpi_video_device_add_fs(device);
 
-               return_VALUE(0);
+               return 0;
        }
 
-end:
-       return_VALUE(-ENOENT);
+       return -ENOENT;
 }
 
 /*
@@ -1437,15 +1325,15 @@ end:
  *  Enumerate the video device list of the video bus, 
  *  bind the ids with the corresponding video devices
  *  under the video bus.
- */  
+ */
 
-static void
-acpi_video_device_rebind( struct acpi_video_bus *video)
+static void acpi_video_device_rebind(struct acpi_video_bus *video)
 {
-       struct list_head * node, * next;
+       struct list_head *node, *next;
        list_for_each_safe(node, next, &video->video_device_list) {
-               struct acpi_video_device * dev = container_of(node, struct acpi_video_device, entry);
-               acpi_video_device_bind( video, dev);
+               struct acpi_video_device *dev =
+                   container_of(node, struct acpi_video_device, entry);
+               acpi_video_device_bind(video, dev);
        }
 }
 
@@ -1460,21 +1348,20 @@ acpi_video_device_rebind( struct acpi_video_bus *video)
  *  
  *  Bind the ids with the corresponding video devices
  *  under the video bus.
- */  
+ */
 
 static void
-acpi_video_device_bind( struct acpi_video_bus *video,
-                       struct acpi_video_device *device)
+acpi_video_device_bind(struct acpi_video_bus *video,
+                      struct acpi_video_device *device)
 {
-       int     i;
-       ACPI_FUNCTION_TRACE("acpi_video_device_bind");
+       int i;
 
 #define IDS_VAL(i) video->attached_array[i].value.int_val
 #define IDS_BIND(i) video->attached_array[i].bind_info
-       
-       for (i = 0; IDS_VAL(i) != ACPI_VIDEO_HEAD_INVALID && 
-               i < video->attached_count; i++) {
-               if (device->device_id == (IDS_VAL(i)& 0xffff)) {
+
+       for (i = 0; IDS_VAL(i) != ACPI_VIDEO_HEAD_INVALID &&
+            i < video->attached_count; i++) {
+               if (device->device_id == (IDS_VAL(i) & 0xffff)) {
                        IDS_BIND(i) = device;
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "device_bind %d\n", i));
                }
@@ -1492,39 +1379,39 @@ acpi_video_device_bind( struct acpi_video_bus *video,
  *  
  *  Call _DOD to enumerate all devices attached to display adapter
  *
- */  
+ */
 
 static int acpi_video_device_enumerate(struct acpi_video_bus *video)
 {
-       int                     status;
-       int                     count;
-       int                     i;
+       int status;
+       int count;
+       int i;
        struct acpi_video_enumerated_device *active_device_list;
-       struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       union acpi_object       *dod = NULL;
-       union acpi_object       *obj;
-
-       ACPI_FUNCTION_TRACE("acpi_video_device_enumerate");
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *dod = NULL;
+       union acpi_object *obj;
 
-       status = acpi_evaluate_object(video->handle, "_DOD", NULL, &buffer);
+       status = acpi_evaluate_object(video->device->handle, "_DOD", NULL, &buffer);
        if (!ACPI_SUCCESS(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _DOD\n"));
-               return_VALUE(status);
+               ACPI_EXCEPTION((AE_INFO, status, "Evaluating _DOD"));
+               return status;
        }
 
-       dod = (union acpi_object *) buffer.pointer;
+       dod = buffer.pointer;
        if (!dod || (dod->type != ACPI_TYPE_PACKAGE)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _DOD data\n"));
+               ACPI_EXCEPTION((AE_INFO, status, "Invalid _DOD data"));
                status = -EFAULT;
                goto out;
        }
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d video heads in _DOD\n",
-               dod->package.count));
+                         dod->package.count));
 
-       active_device_list= kmalloc(
-               (1+dod->package.count)*sizeof(struct acpi_video_enumerated_device),
-               GFP_KERNEL);
+       active_device_list = kmalloc((1 +
+                                     dod->package.count) *
+                                    sizeof(struct
+                                           acpi_video_enumerated_device),
+                                    GFP_KERNEL);
 
        if (!active_device_list) {
                status = -ENOMEM;
@@ -1533,27 +1420,28 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
 
        count = 0;
        for (i = 0; i < dod->package.count; i++) {
-               obj = (union acpi_object *) &dod->package.elements[i];
+               obj = &dod->package.elements[i];
 
                if (obj->type != ACPI_TYPE_INTEGER) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _DOD data\n"));
-                       active_device_list[i].value.int_val = ACPI_VIDEO_HEAD_INVALID;
+                       printk(KERN_ERR PREFIX "Invalid _DOD data\n");
+                       active_device_list[i].value.int_val =
+                           ACPI_VIDEO_HEAD_INVALID;
                }
                active_device_list[i].value.int_val = obj->integer.value;
                active_device_list[i].bind_info = NULL;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "dod element[%d] = %d\n", i, (int) obj->integer.value));
+               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "dod element[%d] = %d\n", i,
+                                 (int)obj->integer.value));
                count++;
        }
        active_device_list[count].value.int_val = ACPI_VIDEO_HEAD_END;
 
-       if(video->attached_array)
-               kfree(video->attached_array);
-       
+       kfree(video->attached_array);
+
        video->attached_array = active_device_list;
        video->attached_count = count;
-out:
-       acpi_os_free(buffer.pointer);
-       return_VALUE(status);
+      out:
+       kfree(buffer.pointer);
+       return status;
 }
 
 /*
@@ -1567,34 +1455,34 @@ out:
  *     1. Find out the current active output device.
  *     2. Identify the next output device to switch
  *     3. call _DSS to do actual switch.
- */  
+ */
 
-static int 
-acpi_video_switch_output(
-       struct acpi_video_bus *video, 
-       int     event)
+static int acpi_video_switch_output(struct acpi_video_bus *video, int event)
 {
-       struct list_head * node, * next;
-       struct acpi_video_device *dev=NULL;
-               struct acpi_video_device *dev_next=NULL;
-       struct acpi_video_device *dev_prev=NULL;
+       struct list_head *node, *next;
+       struct acpi_video_device *dev = NULL;
+       struct acpi_video_device *dev_next = NULL;
+       struct acpi_video_device *dev_prev = NULL;
        unsigned long state;
        int status = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_video_switch_output");
 
        list_for_each_safe(node, next, &video->video_device_list) {
                dev = container_of(node, struct acpi_video_device, entry);
                status = acpi_video_device_get_state(dev, &state);
-               if (state & 0x2){
-                       dev_next = container_of(node->next, struct acpi_video_device, entry);
-                       dev_prev = container_of(node->prev, struct acpi_video_device, entry);
+               if (state & 0x2) {
+                       dev_next =
+                           container_of(node->next, struct acpi_video_device,
+                                        entry);
+                       dev_prev =
+                           container_of(node->prev, struct acpi_video_device,
+                                        entry);
                        goto out;
                }
        }
        dev_next = container_of(node->next, struct acpi_video_device, entry);
        dev_prev = container_of(node->prev, struct acpi_video_device, entry);
-out:   
+      out:
        switch (event) {
        case ACPI_VIDEO_NOTIFY_CYCLE:
        case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT:
@@ -1608,24 +1496,45 @@ out:
                break;
        }
 
-       return_VALUE(status);
+       return status;
 }
 
-static int 
-acpi_video_get_next_level(
-       struct acpi_video_device *device,
-       u32     level_current,
-       u32     event)
+static int
+acpi_video_get_next_level(struct acpi_video_device *device,
+                         u32 level_current, u32 event)
 {
-       /*Fix me*/
-       return level_current;
-}
+       int min, max, min_above, max_below, i, l;
+       max = max_below = 0;
+       min = min_above = 255;
+       for (i = 0; i < device->brightness->count; i++) {
+               l = device->brightness->levels[i];
+               if (l < min)
+                       min = l;
+               if (l > max)
+                       max = l;
+               if (l < min_above && l > level_current)
+                       min_above = l;
+               if (l > max_below && l < level_current)
+                       max_below = l;
+       }
 
+       switch (event) {
+       case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:
+               return (level_current < max) ? min_above : min;
+       case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:
+               return (level_current < max) ? min_above : max;
+       case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:
+               return (level_current > min) ? max_below : min;
+       case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS:
+       case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:
+               return 0;
+       default:
+               return level_current;
+       }
+}
 
 static void
-acpi_video_switch_brightness (
-       struct acpi_video_device *device, 
-       int     event)
+acpi_video_switch_brightness(struct acpi_video_device *device, int event)
 {
        unsigned long level_current, level_next;
        acpi_video_device_lcd_get_level_current(device, &level_current);
@@ -1634,44 +1543,40 @@ acpi_video_switch_brightness (
 }
 
 static int
-acpi_video_bus_get_devices (
-       struct acpi_video_bus   *video,
-       struct acpi_device      *device)
+acpi_video_bus_get_devices(struct acpi_video_bus *video,
+                          struct acpi_device *device)
 {
-       int                     status = 0;
-       struct list_head        *node, *next;
+       int status = 0;
+       struct list_head *node, *next;
 
-       ACPI_FUNCTION_TRACE("acpi_video_get_devices");
 
        acpi_video_device_enumerate(video);
 
        list_for_each_safe(node, next, &device->children) {
-               struct acpi_device *dev = list_entry(node, struct acpi_device, node);
+               struct acpi_device *dev =
+                   list_entry(node, struct acpi_device, node);
 
                if (!dev)
                        continue;
 
                status = acpi_video_bus_get_one_device(dev, video);
                if (ACPI_FAILURE(status)) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Cant attach device\n"));
+                       ACPI_EXCEPTION((AE_INFO, status, "Cant attach device"));
                        continue;
                }
 
        }
-       return_VALUE(status);
+       return status;
 }
 
-static int
-acpi_video_bus_put_one_device(
-       struct acpi_video_device        *device)
+static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
 {
        acpi_status status;
        struct acpi_video_bus *video;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_put_one_device");
 
        if (!device || !device->video)
-               return_VALUE(-ENOENT);
+               return -ENOENT;
 
        video = device->video;
 
@@ -1680,75 +1585,62 @@ acpi_video_bus_put_one_device(
        up(&video->sem);
        acpi_video_device_remove_fs(device->dev);
 
-       status = acpi_remove_notify_handler(device->handle,
-               ACPI_DEVICE_NOTIFY, acpi_video_device_notify);
-       if (ACPI_FAILURE(status))
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Error removing notify handler\n"));
+       status = acpi_remove_notify_handler(device->dev->handle,
+                                           ACPI_DEVICE_NOTIFY,
+                                           acpi_video_device_notify);
 
-       return_VALUE(0);
+       return 0;
 }
 
-static int
-acpi_video_bus_put_devices (
-       struct acpi_video_bus   *video)
+static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
 {
-       int                     status;
-       struct list_head        *node, *next;
+       int status;
+       struct list_head *node, *next;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_put_devices");
 
        list_for_each_safe(node, next, &video->video_device_list) {
-               struct acpi_video_device *data = list_entry(node, struct acpi_video_device, entry);
+               struct acpi_video_device *data =
+                   list_entry(node, struct acpi_video_device, entry);
                if (!data)
                        continue;
 
                status = acpi_video_bus_put_one_device(data);
-               if(ACPI_FAILURE(status))
-                       printk(KERN_WARNING PREFIX "hhuuhhuu bug in acpi video driver.\n");
+               if (ACPI_FAILURE(status))
+                       printk(KERN_WARNING PREFIX
+                              "hhuuhhuu bug in acpi video driver.\n");
 
                if (data->brightness)
-                       kfree(data->brightness);
-
+                       kfree(data->brightness->levels);
+               kfree(data->brightness);
                kfree(data);
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 /* acpi_video interface */
 
-static int
-acpi_video_bus_start_devices(
-       struct acpi_video_bus   *video)
+static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
 {
        return acpi_video_bus_DOS(video, 1, 0);
 }
 
-static int
-acpi_video_bus_stop_devices(
-       struct acpi_video_bus   *video)
+static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
 {
        return acpi_video_bus_DOS(video, 0, 1);
 }
 
-static void
-acpi_video_bus_notify (
-       acpi_handle             handle,
-       u32                     event,
-       void                    *data)
+static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
 {
-       struct acpi_video_bus   *video = (struct acpi_video_bus *) data;
-       struct acpi_device      *device = NULL;
+       struct acpi_video_bus *video = data;
+       struct acpi_device *device = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_notify");
        printk("video bus notify\n");
 
        if (!video)
-               return_VOID;
+               return;
 
-       if (acpi_bus_get_device(handle, &device))
-               return_VOID;
+       device = video->device;
 
        switch (event) {
        case ACPI_VIDEO_NOTIFY_SWITCH:  /* User request that a switch occur,
@@ -1764,80 +1656,70 @@ acpi_video_bus_notify (
                acpi_bus_generate_event(device, event, 0);
                break;
 
-       case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed.*/
-       case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */
-       case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */
+       case ACPI_VIDEO_NOTIFY_CYCLE:   /* Cycle Display output hotkey pressed. */
+       case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT:     /* Next Display output hotkey pressed. */
+       case ACPI_VIDEO_NOTIFY_PREV_OUTPUT:     /* previous Display output hotkey pressed. */
                acpi_video_switch_output(video, event);
                acpi_bus_generate_event(device, event, 0);
                break;
 
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                       "Unsupported event [0x%x]\n", event));
+                                 "Unsupported event [0x%x]\n", event));
                break;
        }
 
-       return_VOID;
+       return;
 }
 
-static void
-acpi_video_device_notify (
-       acpi_handle             handle,
-       u32                     event,
-       void                    *data)
+static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
 {
-       struct acpi_video_device        *video_device = (struct acpi_video_device *) data;
-       struct acpi_device      *device = NULL;
+       struct acpi_video_device *video_device = data;
+       struct acpi_device *device = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_notify");
 
        printk("video device notify\n");
        if (!video_device)
-               return_VOID;
+               return;
 
-       if (acpi_bus_get_device(handle, &device))
-               return_VOID;
+       device = video_device->dev;
 
        switch (event) {
-       case ACPI_VIDEO_NOTIFY_SWITCH: /* change in status (cycle output device) */
-       case ACPI_VIDEO_NOTIFY_PROBE: /* change in status (output device status) */
+       case ACPI_VIDEO_NOTIFY_SWITCH:  /* change in status (cycle output device) */
+       case ACPI_VIDEO_NOTIFY_PROBE:   /* change in status (output device status) */
                acpi_bus_generate_event(device, event, 0);
                break;
-       case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */
-       case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */
-       case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS: /* Decrease brightness */
-       case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */
-       case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */
-               acpi_video_switch_brightness (video_device, event);
+       case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:        /* Cycle brightness */
+       case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:  /* Increase brightness */
+       case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:  /* Decrease brightness */
+       case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */
+       case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:     /* display device off */
+               acpi_video_switch_brightness(video_device, event);
                acpi_bus_generate_event(device, event, 0);
                break;
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                       "Unsupported event [0x%x]\n", event));
+                                 "Unsupported event [0x%x]\n", event));
                break;
        }
-       return_VOID;
+       return;
 }
 
-static int
-acpi_video_bus_add (
-       struct acpi_device      *device)
+static int acpi_video_bus_add(struct acpi_device *device)
 {
-       int                     result = 0;
-       acpi_status             status = 0;
-       struct acpi_video_bus   *video = NULL;
+       int result = 0;
+       acpi_status status = 0;
+       struct acpi_video_bus *video = NULL;
+
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_add");
-       
        if (!device)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
-       video = kmalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
+       video = kzalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
        if (!video)
-               return_VALUE(-ENOMEM);
-       memset(video, 0, sizeof(struct acpi_video_bus));
+               return -ENOMEM;
 
-       video->handle = device->handle;
+       video->device = device;
        strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
        strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
        acpi_driver_data(device) = video;
@@ -1857,77 +1739,69 @@ acpi_video_bus_add (
        acpi_video_bus_get_devices(video, device);
        acpi_video_bus_start_devices(video);
 
-       status = acpi_install_notify_handler(video->handle,
-               ACPI_DEVICE_NOTIFY, acpi_video_bus_notify, video);
+       status = acpi_install_notify_handler(device->handle,
+                                            ACPI_DEVICE_NOTIFY,
+                                            acpi_video_bus_notify, video);
        if (ACPI_FAILURE(status)) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Error installing notify handler\n"));
+                                 "Error installing notify handler\n"));
+               acpi_video_bus_stop_devices(video);
+               acpi_video_bus_put_devices(video);
+               kfree(video->attached_array);
+               acpi_video_bus_remove_fs(device);
                result = -ENODEV;
                goto end;
        }
 
        printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
-               ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
-               video->flags.multihead ? "yes":"no",
-               video->flags.rom ? "yes":"no",
-               video->flags.post ? "yes":"no");
+              ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
+              video->flags.multihead ? "yes" : "no",
+              video->flags.rom ? "yes" : "no",
+              video->flags.post ? "yes" : "no");
 
-end:
-       if (result) {
-               acpi_video_bus_remove_fs(device);
+      end:
+       if (result)
                kfree(video);
-       }
 
-       return_VALUE(result);
+       return result;
 }
 
-static int
-acpi_video_bus_remove (
-       struct acpi_device      *device,
-       int                     type)
+static int acpi_video_bus_remove(struct acpi_device *device, int type)
 {
-       acpi_status             status = 0;
-       struct acpi_video_bus   *video = NULL;
+       acpi_status status = 0;
+       struct acpi_video_bus *video = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_remove");
 
        if (!device || !acpi_driver_data(device))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
-       video = (struct acpi_video_bus *) acpi_driver_data(device);
+       video = acpi_driver_data(device);
 
        acpi_video_bus_stop_devices(video);
 
-       status = acpi_remove_notify_handler(video->handle,
-               ACPI_DEVICE_NOTIFY, acpi_video_bus_notify);
-       if (ACPI_FAILURE(status))
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Error removing notify handler\n"));
+       status = acpi_remove_notify_handler(video->device->handle,
+                                           ACPI_DEVICE_NOTIFY,
+                                           acpi_video_bus_notify);
 
        acpi_video_bus_put_devices(video);
        acpi_video_bus_remove_fs(device);
 
-       if (video->attached_array)
-               kfree(video->attached_array);
+       kfree(video->attached_array);
        kfree(video);
 
-       return_VALUE(0);
+       return 0;
 }
 
-
 static int
-acpi_video_bus_match (
-       struct acpi_device      *device,
-       struct acpi_driver      *driver)
+acpi_video_bus_match(struct acpi_device *device, struct acpi_driver *driver)
 {
-       acpi_handle             h_dummy1;
-       acpi_handle             h_dummy2;
-       acpi_handle             h_dummy3;
+       acpi_handle h_dummy1;
+       acpi_handle h_dummy2;
+       acpi_handle h_dummy3;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_match");
 
        if (!device || !driver)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        /* Since there is no HID, CID for ACPI Video drivers, we have
         * to check well known required nodes for each feature we support.
@@ -1936,59 +1810,53 @@ acpi_video_bus_match (
        /* Does this device able to support video switching ? */
        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy1)) &&
            ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy2)))
-               return_VALUE(0);
+               return 0;
 
        /* Does this device able to retrieve a video ROM ? */
        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy1)))
-               return_VALUE(0);
+               return 0;
 
        /* Does this device able to configure which video head to be POSTed ? */
        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy1)) &&
            ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy2)) &&
            ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy3)))
-               return_VALUE(0);
+               return 0;
 
-
-       return_VALUE(-ENODEV);
+       return -ENODEV;
 }
 
-
-static int __init
-acpi_video_init (void)
+static int __init acpi_video_init(void)
 {
-       int                     result = 0;
+       int result = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_video_init");
 
        /*
-       acpi_dbg_level = 0xFFFFFFFF;
-       acpi_dbg_layer = 0x08000000;
-       */
+          acpi_dbg_level = 0xFFFFFFFF;
+          acpi_dbg_layer = 0x08000000;
+        */
 
        acpi_video_dir = proc_mkdir(ACPI_VIDEO_CLASS, acpi_root_dir);
        if (!acpi_video_dir)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        acpi_video_dir->owner = THIS_MODULE;
 
        result = acpi_bus_register_driver(&acpi_video_bus);
        if (result < 0) {
                remove_proc_entry(ACPI_VIDEO_CLASS, acpi_root_dir);
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
-static void __exit
-acpi_video_exit (void)
+static void __exit acpi_video_exit(void)
 {
-       ACPI_FUNCTION_TRACE("acpi_video_exit");
 
        acpi_bus_unregister_driver(&acpi_video_bus);
 
        remove_proc_entry(ACPI_VIDEO_CLASS, acpi_root_dir);
 
-       return_VOID;
+       return;
 }
 
 module_init(acpi_video_init);