|
@@ -272,10 +272,9 @@ 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);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -284,11 +283,10 @@ 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);
|
|
|
|
|
|
- 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);
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -315,13 +312,12 @@ 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);
|
|
|
if (!ACPI_SUCCESS(status))
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
obj = (union acpi_object *)buffer.pointer;
|
|
|
if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
|
|
|
printk(KERN_ERR PREFIX "Invalid _BCL data\n");
|
|
@@ -331,12 +327,12 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
|
|
|
|
|
|
*levels = obj;
|
|
|
|
|
|
- return_VALUE(0);
|
|
|
+ return 0;
|
|
|
|
|
|
err:
|
|
|
kfree(buffer.pointer);
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -346,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);
|
|
|
|
|
|
printk(KERN_DEBUG "set_level status: %x\n", status);
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -360,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);
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -377,22 +371,21 @@ 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);
|
|
|
if (ACPI_FAILURE(status))
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
|
|
|
obj = (union acpi_object *)buffer.pointer;
|
|
|
|
|
@@ -404,7 +397,7 @@ acpi_video_device_EDID(struct acpi_video_device *device,
|
|
|
kfree(obj);
|
|
|
}
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
/* bus */
|
|
@@ -417,7 +410,6 @@ 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;
|
|
|
|
|
@@ -425,7 +417,7 @@ acpi_video_bus_set_POST(struct acpi_video_bus *video, unsigned long option)
|
|
|
if (ACPI_SUCCESS(status))
|
|
|
status = tmp ? (-EINVAL) : (AE_OK);
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -433,11 +425,10 @@ 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);
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -445,12 +436,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);
|
|
|
*options &= 3;
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -481,7 +471,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;
|
|
@@ -492,7 +481,7 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
|
|
|
acpi_evaluate_object(video->handle, "_DOS", &args, NULL);
|
|
|
|
|
|
Failed:
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -514,7 +503,6 @@ 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);
|
|
|
|
|
@@ -582,7 +570,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
|
|
|
|
|
|
kfree(obj);
|
|
|
|
|
|
- return_VOID;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -629,10 +617,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.
|
|
@@ -656,7 +643,7 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
|
|
|
status = 0;
|
|
|
}
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
/* --------------------------------------------------------------------------
|
|
@@ -672,7 +659,6 @@ 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;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_device_info_seq_show");
|
|
|
|
|
|
if (!dev)
|
|
|
goto end;
|
|
@@ -691,7 +677,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
|
|
@@ -708,7 +694,6 @@ static int acpi_video_device_state_seq_show(struct seq_file *seq, void *offset)
|
|
|
(struct acpi_video_device *)seq->private;
|
|
|
unsigned long state;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_device_state_seq_show");
|
|
|
|
|
|
if (!dev)
|
|
|
goto end;
|
|
@@ -728,7 +713,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
|
|
@@ -749,13 +734,12 @@ acpi_video_device_write_state(struct file *file,
|
|
|
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);
|
|
@@ -764,9 +748,9 @@ 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
|
|
@@ -776,11 +760,10 @@ acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
|
|
|
(struct acpi_video_device *)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: ");
|
|
@@ -788,7 +771,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
|
|
@@ -809,19 +792,18 @@ acpi_video_device_write_brightness(struct file *file,
|
|
|
unsigned int level = 0;
|
|
|
int i;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
|
|
|
|
|
|
if (!dev || !dev->brightness || count + 1 > sizeof str)
|
|
|
- return_VALUE(-EINVAL);
|
|
|
+ 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++)
|
|
@@ -832,7 +814,7 @@ 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)
|
|
@@ -843,7 +825,6 @@ static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset)
|
|
|
int i;
|
|
|
union acpi_object *edid = NULL;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_device_EDID_seq_show");
|
|
|
|
|
|
if (!dev)
|
|
|
goto out;
|
|
@@ -868,7 +849,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
|
|
@@ -883,27 +864,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);
|
|
|
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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
entry->proc_fops = &acpi_video_device_info_fops;
|
|
|
entry->data = acpi_driver_data(device);
|
|
@@ -915,7 +895,7 @@ 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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
acpi_video_device_state_fops.write = acpi_video_device_write_state;
|
|
|
entry->proc_fops = &acpi_video_device_state_fops;
|
|
@@ -928,7 +908,7 @@ 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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
acpi_video_device_brightness_fops.write = acpi_video_device_write_brightness;
|
|
|
entry->proc_fops = &acpi_video_device_brightness_fops;
|
|
@@ -939,24 +919,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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ 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);
|
|
|
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));
|
|
@@ -967,7 +946,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
|
|
|
acpi_device_dir(device) = NULL;
|
|
|
}
|
|
|
|
|
|
- return_VALUE(0);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/* video bus */
|
|
@@ -975,7 +954,6 @@ 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;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_bus_info_seq_show");
|
|
|
|
|
|
if (!video)
|
|
|
goto end;
|
|
@@ -988,7 +966,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)
|
|
@@ -1001,7 +979,6 @@ 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;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_bus_ROM_seq_show");
|
|
|
|
|
|
if (!video)
|
|
|
goto end;
|
|
@@ -1010,7 +987,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)
|
|
@@ -1024,7 +1001,6 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
|
|
|
unsigned long options;
|
|
|
int status;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_bus_POST_info_seq_show");
|
|
|
|
|
|
if (!video)
|
|
|
goto end;
|
|
@@ -1047,7 +1023,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
|
|
@@ -1063,7 +1039,6 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
|
|
|
int status;
|
|
|
unsigned long id;
|
|
|
|
|
|
- ACPI_FUNCTION_TRACE("acpi_video_bus_POST_seq_show");
|
|
|
|
|
|
if (!video)
|
|
|
goto end;
|
|
@@ -1076,18 +1051,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;
|
|
|
|
|
|
- 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)
|
|
@@ -1112,22 +1086,21 @@ acpi_video_bus_write_POST(struct file *file,
|
|
|
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;
|
|
@@ -1135,11 +1108,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
|
|
@@ -1153,25 +1126,24 @@ acpi_video_bus_write_DOS(struct file *file,
|
|
|
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)
|
|
@@ -1179,7 +1151,6 @@ 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);
|
|
|
|
|
@@ -1187,7 +1158,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *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;
|
|
|
}
|
|
@@ -1195,7 +1166,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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
entry->proc_fops = &acpi_video_bus_info_fops;
|
|
|
entry->data = acpi_driver_data(device);
|
|
@@ -1205,7 +1176,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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
entry->proc_fops = &acpi_video_bus_ROM_fops;
|
|
|
entry->data = acpi_driver_data(device);
|
|
@@ -1216,7 +1187,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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
entry->proc_fops = &acpi_video_bus_POST_info_fops;
|
|
|
entry->data = acpi_driver_data(device);
|
|
@@ -1228,7 +1199,7 @@ 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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
|
|
|
entry->proc_fops = &acpi_video_bus_POST_fops;
|
|
@@ -1241,7 +1212,7 @@ 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)
|
|
|
- return_VALUE(-ENODEV);
|
|
|
+ return -ENODEV;
|
|
|
else {
|
|
|
acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
|
|
|
entry->proc_fops = &acpi_video_bus_DOS_fops;
|
|
@@ -1249,14 +1220,13 @@ static int acpi_video_bus_add_fs(struct acpi_device *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);
|
|
|
|
|
@@ -1270,7 +1240,7 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)
|
|
|
acpi_device_dir(device) = NULL;
|
|
|
}
|
|
|
|
|
|
- return_VALUE(0);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/* --------------------------------------------------------------------------
|
|
@@ -1287,10 +1257,9 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
|
|
|
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);
|
|
@@ -1298,7 +1267,7 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
|
|
|
|
|
|
data = kmalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
|
|
|
if (!data)
|
|
|
- return_VALUE(-ENOMEM);
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
memset(data, 0, sizeof(struct acpi_video_device));
|
|
|
|
|
@@ -1349,10 +1318,10 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
|
|
|
|
|
|
acpi_video_device_add_fs(device);
|
|
|
|
|
|
- return_VALUE(0);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
- return_VALUE(-ENOENT);
|
|
|
+ return -ENOENT;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1395,7 +1364,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
|
|
@@ -1432,12 +1400,11 @@ 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);
|
|
|
if (!ACPI_SUCCESS(status)) {
|
|
|
ACPI_EXCEPTION((AE_INFO, status, "Evaluating _DOD"));
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
dod = (union acpi_object *)buffer.pointer;
|
|
@@ -1484,7 +1451,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
|
|
|
video->attached_count = count;
|
|
|
out:
|
|
|
acpi_os_free(buffer.pointer);
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1509,7 +1476,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);
|
|
@@ -1540,7 +1506,7 @@ static int acpi_video_switch_output(struct acpi_video_bus *video, int event)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -1567,7 +1533,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);
|
|
|
|
|
@@ -1585,7 +1550,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- return_VALUE(status);
|
|
|
+ return status;
|
|
|
}
|
|
|
|
|
|
static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
|
|
@@ -1593,10 +1558,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;
|
|
|
|
|
@@ -1609,7 +1573,7 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
|
|
|
ACPI_DEVICE_NOTIFY,
|
|
|
acpi_video_device_notify);
|
|
|
|
|
|
- return_VALUE(0);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
|
|
@@ -1617,7 +1581,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 =
|
|
@@ -1636,7 +1599,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
|
|
|
kfree(data);
|
|
|
}
|
|
|
|
|
|
- return_VALUE(0);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/* acpi_video interface */
|
|
@@ -1656,14 +1619,13 @@ 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;
|
|
|
|
|
|
- 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;
|
|
|
+ return;
|
|
|
|
|
|
switch (event) {
|
|
|
case ACPI_VIDEO_NOTIFY_SWITCH: /* User request that a switch occur,
|
|
@@ -1692,7 +1654,7 @@ 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)
|
|
@@ -1701,14 +1663,13 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
|
|
|
(struct acpi_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;
|
|
|
+ return;
|
|
|
|
|
|
switch (event) {
|
|
|
case ACPI_VIDEO_NOTIFY_SWITCH: /* change in status (cycle output device) */
|
|
@@ -1728,7 +1689,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)
|
|
@@ -1737,14 +1698,13 @@ 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);
|
|
|
if (!video)
|
|
|
- return_VALUE(-ENOMEM);
|
|
|
+ return -ENOMEM;
|
|
|
memset(video, 0, sizeof(struct acpi_video_bus));
|
|
|
|
|
|
video->handle = device->handle;
|
|
@@ -1791,7 +1751,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
|
|
|
if (result)
|
|
|
kfree(video);
|
|
|
|
|
|
- return_VALUE(result);
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
static int acpi_video_bus_remove(struct acpi_device *device, int type)
|
|
@@ -1799,10 +1759,9 @@ 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);
|
|
|
|
|
@@ -1818,7 +1777,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
|
|
|
kfree(video->attached_array);
|
|
|
kfree(video);
|
|
|
|
|
|
- return_VALUE(0);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static int
|
|
@@ -1828,10 +1787,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.
|
|
@@ -1840,26 +1798,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;
|
|
@@ -1868,27 +1825,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);
|