ACPI: replace kmalloc+memset with kzalloc
[linux-2.6.git] / drivers / acpi / video.c
index e383d61..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)
@@ -117,7 +118,7 @@ struct acpi_video_enumerated_device {
 };
 
 struct acpi_video_bus {
-       acpi_handle handle;
+       struct acpi_device *device;
        u8 dos_setting;
        struct acpi_video_enumerated_device *attached_array;
        u8 attached_count;
@@ -155,7 +156,6 @@ struct acpi_video_device_brightness {
 };
 
 struct acpi_video_device {
-       acpi_handle handle;
        unsigned long device_id;
        struct acpi_video_device_flags flags;
        struct acpi_video_device_cap cap;
@@ -272,10 +272,10 @@ static int
 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);
 
-       return_VALUE(status);
+       status = acpi_evaluate_integer(device->dev->handle, "_DGS", NULL, state);
+
+       return status;
 }
 
 static int
@@ -284,11 +284,9 @@ acpi_video_device_get_state(struct acpi_video_device *device,
 {
        int status;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_get_state");
-
-       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
@@ -299,12 +297,11 @@ acpi_video_device_set_state(struct acpi_video_device *device, int state)
        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, &ret);
+       status = acpi_evaluate_integer(device->dev->handle, "_DSS", &args, &ret);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
@@ -315,29 +312,27 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
        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);
+               return status;
        obj = (union acpi_object *)buffer.pointer;
-       if (!obj && (obj->type != ACPI_TYPE_PACKAGE)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _BCL data\n"));
+       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);
+       kfree(buffer.pointer);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
@@ -347,13 +342,12 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level)
        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
@@ -361,11 +355,10 @@ 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");
 
-       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
@@ -378,34 +371,33 @@ acpi_video_device_EDID(struct acpi_video_device *device,
        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 */
@@ -418,15 +410,14 @@ acpi_video_bus_set_POST(struct acpi_video_bus *video, unsigned long option)
        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);
 
-       return_VALUE(status);
+       return status;
 }
 
 static int
@@ -434,11 +425,9 @@ 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->device->handle, "_GPD", NULL, id);
 
-       status = acpi_evaluate_integer(video->handle, "_GPD", NULL, id);
-
-       return_VALUE(status);
+       return status;
 }
 
 static int
@@ -446,12 +435,11 @@ acpi_video_bus_POST_options(struct acpi_video_bus *video,
                            unsigned long *options)
 {
        int status;
-       ACPI_FUNCTION_TRACE("acpi_video_bus_POST_options");
 
-       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;
 }
 
 /*
@@ -482,7 +470,6 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
        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) {
                status = -1;
@@ -490,10 +477,10 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
        }
        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);
+       return status;
 }
 
 /*
@@ -515,29 +502,28 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        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);
 
-       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))) {
+       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))) {
+       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))) {
+       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;
        }
 
@@ -547,11 +533,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                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);
                        if (!br->levels)
@@ -561,8 +546,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                                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;
@@ -584,7 +568,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 
        kfree(obj);
 
-       return_VOID;
+       return;
 }
 
 /*
@@ -602,22 +586,22 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
        acpi_handle h_dummy1;
 
        memset(&video->cap, 0, 4);
-       if (ACPI_SUCCESS(acpi_get_handle(video->handle, "_DOS", &h_dummy1))) {
+       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;
        }
 }
@@ -631,10 +615,9 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
 {
        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.
@@ -658,7 +641,7 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
                status = 0;
        }
 
-       return_VALUE(status);
+       return status;
 }
 
 /* --------------------------------------------------------------------------
@@ -671,10 +654,8 @@ static struct proc_dir_entry *acpi_video_dir;
 
 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;
@@ -693,7 +674,7 @@ static int acpi_video_device_info_seq_show(struct seq_file *seq, void *offset)
        seq_printf(seq, "known by bios: %s\n", dev->flags.bios ? "yes" : "no");
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int
@@ -706,11 +687,9 @@ acpi_video_device_info_open_fs(struct inode *inode, struct file *file)
 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;
+       struct acpi_video_device *dev = seq->private;
        unsigned long state;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_state_seq_show");
 
        if (!dev)
                goto end;
@@ -730,7 +709,7 @@ static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)
                seq_printf(seq, "<not supported>\n");
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int
@@ -746,18 +725,17 @@ acpi_video_device_write_state(struct file *file,
                              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;
+       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);
@@ -766,23 +744,21 @@ acpi_video_device_write_state(struct file *file,
        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)
 {
-       struct acpi_video_device *dev =
-           (struct acpi_video_device *)seq->private;
+       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: ");
@@ -790,7 +766,7 @@ acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
                seq_printf(seq, " %d", dev->brightness->levels[i]);
        seq_printf(seq, "\ncurrent: %d\n", dev->brightness->curr);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int
@@ -805,25 +781,24 @@ 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;
+       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++)
@@ -834,18 +809,16 @@ acpi_video_device_write_brightness(struct file *file,
                        break;
                }
 
-       return_VALUE(count);
+       return count;
 }
 
 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;
+       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;
@@ -870,7 +843,7 @@ static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)
        else
                kfree(edid);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int
@@ -885,28 +858,26 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
        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);
                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);
@@ -918,11 +889,10 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
            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;
        }
@@ -932,11 +902,10 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
            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;
        }
@@ -944,25 +913,23 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
        /* '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)
 {
        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));
@@ -973,15 +940,14 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
                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)
 {
-       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;
@@ -994,7 +960,7 @@ static int acpi_video_bus_info_seq_show(struct seq_file *seq, void *offset)
                   video->flags.post ? "yes" : "no");
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file)
@@ -1005,9 +971,8 @@ static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file)
 
 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;
@@ -1016,7 +981,7 @@ static int acpi_video_bus_ROM_seq_show(struct seq_file *seq, void *offset)
        seq_printf(seq, "<TODO>\n");
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)
@@ -1026,11 +991,10 @@ static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)
 
 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;
+       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;
@@ -1053,7 +1017,7 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
        } else
                seq_printf(seq, "<not supported>\n");
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int
@@ -1065,11 +1029,10 @@ acpi_video_bus_POST_info_open_fs(struct inode *inode, struct file *file)
 
 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;
+       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;
@@ -1082,18 +1045,17 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
        seq_printf(seq, "device posted is <%s>\n", device_decode[id & 3]);
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 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);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_video_bus_POST_open_fs(struct inode *inode, struct file *file)
@@ -1113,27 +1075,26 @@ acpi_video_bus_write_POST(struct file *file,
                          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;
+       struct seq_file *m = file->private_data;
+       struct acpi_video_bus *video = m->private;
        char str[12] = { 0 };
        unsigned long opt, options;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_write_POST");
 
        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;
@@ -1141,11 +1102,11 @@ acpi_video_bus_write_POST(struct file *file,
        if (options & (1ul << 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
@@ -1154,30 +1115,29 @@ acpi_video_bus_write_DOS(struct file *file,
                         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;
+       struct seq_file *m = file->private_data;
+       struct acpi_video_bus *video = m->private;
        char str[12] = { 0 };
        unsigned long opt;
 
-       ACPI_FUNCTION_TRACE("acpi_video_bus_write_DOS");
 
        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);
 
        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)
@@ -1185,15 +1145,14 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
        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);
                if (!acpi_device_dir(device))
-                       return_VALUE(-ENODEV);
+                       return -ENODEV;
                video->dir = acpi_device_dir(device);
                acpi_device_dir(device)->owner = THIS_MODULE;
        }
@@ -1201,8 +1160,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
        /* '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);
@@ -1212,8 +1170,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
        /* '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);
@@ -1224,8 +1181,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *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);
@@ -1237,11 +1193,10 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
            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;
        }
@@ -1251,25 +1206,23 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
            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)
 {
        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));
@@ -1281,7 +1234,7 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)
                acpi_device_dir(device) = NULL;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 /* --------------------------------------------------------------------------
@@ -1295,25 +1248,21 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
                              struct acpi_video_bus *video)
 {
        unsigned long device_id;
-       int status, result;
+       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);
        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);
+                       return -ENOMEM;
 
-               memset(data, 0, sizeof(struct acpi_video_device));
-
-               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;
@@ -1340,15 +1289,18 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
                acpi_video_device_bind(video, data);
                acpi_video_device_find_cap(data);
 
-               status = acpi_install_notify_handler(data->handle,
+               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;
+                       if(data->brightness)
+                               kfree(data->brightness->levels);
+                       kfree(data->brightness);
+                       kfree(data);
+                       return -ENODEV;
                }
 
                down(&video->sem);
@@ -1357,11 +1309,10 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
 
                acpi_video_device_add_fs(device);
 
-               return_VALUE(0);
+               return 0;
        }
 
-      end:
-       return_VALUE(-ENOENT);
+       return -ENOENT;
 }
 
 /*
@@ -1404,7 +1355,6 @@ acpi_video_device_bind(struct acpi_video_bus *video,
                       struct acpi_video_device *device)
 {
        int i;
-       ACPI_FUNCTION_TRACE("acpi_video_device_bind");
 
 #define IDS_VAL(i) video->attached_array[i].value.int_val
 #define IDS_BIND(i) video->attached_array[i].bind_info
@@ -1441,17 +1391,15 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
        union acpi_object *dod = NULL;
        union acpi_object *obj;
 
-       ACPI_FUNCTION_TRACE("acpi_video_device_enumerate");
-
-       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;
        }
@@ -1472,11 +1420,10 @@ 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"));
+                       printk(KERN_ERR PREFIX "Invalid _DOD data\n");
                        active_device_list[i].value.int_val =
                            ACPI_VIDEO_HEAD_INVALID;
                }
@@ -1488,14 +1435,13 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
        }
        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);
+       kfree(buffer.pointer);
+       return status;
 }
 
 /*
@@ -1520,7 +1466,6 @@ static int acpi_video_switch_output(struct acpi_video_bus *video, int event)
        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);
@@ -1551,15 +1496,41 @@ static int acpi_video_switch_output(struct acpi_video_bus *video, int event)
                break;
        }
 
-       return_VALUE(status);
+       return status;
 }
 
 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
@@ -1578,7 +1549,6 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
        int status = 0;
        struct list_head *node, *next;
 
-       ACPI_FUNCTION_TRACE("acpi_video_get_devices");
 
        acpi_video_device_enumerate(video);
 
@@ -1591,13 +1561,12 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
 
                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)
@@ -1605,10 +1574,9 @@ 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;
 
@@ -1617,14 +1585,11 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
        up(&video->sem);
        acpi_video_device_remove_fs(device->dev);
 
-       status = acpi_remove_notify_handler(device->handle,
+       status = acpi_remove_notify_handler(device->dev->handle,
                                            ACPI_DEVICE_NOTIFY,
                                            acpi_video_device_notify);
-       if (ACPI_FAILURE(status))
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Error removing notify handler\n"));
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
@@ -1632,7 +1597,6 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
        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 =
@@ -1646,12 +1610,12 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
                               "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 */
@@ -1668,17 +1632,15 @@ static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)
 
 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_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,
@@ -1707,23 +1669,20 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
                break;
        }
 
-       return_VOID;
+       return;
 }
 
 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_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) */
@@ -1743,7 +1702,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
                                  "Unsupported event [0x%x]\n", event));
                break;
        }
-       return_VOID;
+       return;
 }
 
 static int acpi_video_bus_add(struct acpi_device *device)
@@ -1752,17 +1711,15 @@ static int acpi_video_bus_add(struct acpi_device *device)
        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;
@@ -1782,12 +1739,16 @@ static int acpi_video_bus_add(struct acpi_device *device)
        acpi_video_bus_get_devices(video, device);
        acpi_video_bus_start_devices(video);
 
-       status = acpi_install_notify_handler(video->handle,
+       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"));
+               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;
        }
@@ -1799,12 +1760,10 @@ static int acpi_video_bus_add(struct acpi_device *device)
               video->flags.post ? "yes" : "no");
 
       end:
-       if (result) {
-               acpi_video_bus_remove_fs(device);
+       if (result)
                kfree(video);
-       }
 
-       return_VALUE(result);
+       return result;
 }
 
 static int acpi_video_bus_remove(struct acpi_device *device, int type)
@@ -1812,30 +1771,25 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
        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,
+       status = acpi_remove_notify_handler(video->device->handle,
                                            ACPI_DEVICE_NOTIFY,
                                            acpi_video_bus_notify);
-       if (ACPI_FAILURE(status))
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Error removing notify handler\n"));
 
        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
@@ -1845,10 +1799,9 @@ acpi_video_bus_match(struct acpi_device *device, struct acpi_driver *driver)
        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.
@@ -1857,26 +1810,25 @@ acpi_video_bus_match(struct acpi_device *device, struct acpi_driver *driver)
        /* 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)
 {
        int result = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_video_init");
 
        /*
           acpi_dbg_level = 0xFFFFFFFF;
@@ -1885,27 +1837,26 @@ static int __init acpi_video_init(void)
 
        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)
 {
-       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);