};
struct acpi_video_bus {
- struct acpi_device *device;
+ acpi_handle handle;
u8 dos_setting;
struct acpi_video_enumerated_device *attached_array;
u8 attached_count;
};
struct acpi_video_device {
+ acpi_handle handle;
unsigned long device_id;
struct acpi_video_device_flags flags;
struct acpi_video_device_cap cap;
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);
- status = acpi_evaluate_integer(device->dev->handle, "_DGS", NULL, state);
-
- return status;
+ return_VALUE(status);
}
static int
{
int status;
- status = acpi_evaluate_integer(device->dev->handle, "_DCS", NULL, state);
+ ACPI_FUNCTION_TRACE("acpi_video_device_get_state");
+
+ status = acpi_evaluate_integer(device->handle, "_DCS", NULL, state);
- return status;
+ return_VALUE(status);
}
static int
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->dev->handle, "_DSS", &args, &ret);
+ status = acpi_evaluate_integer(device->handle, "_DSS", &args, &ret);
- return status;
+ return_VALUE(status);
}
static int
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->dev->handle, "_BCL", NULL, &buffer);
+ status = acpi_evaluate_object(device->handle, "_BCL", NULL, &buffer);
if (!ACPI_SUCCESS(status))
- return status;
+ return_VALUE(status);
obj = (union acpi_object *)buffer.pointer;
- if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
- printk(KERN_ERR PREFIX "Invalid _BCL data\n");
+ if (!obj && (obj->type != ACPI_TYPE_PACKAGE)) {
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _BCL data\n"));
status = -EFAULT;
goto err;
}
*levels = obj;
- return 0;
+ return_VALUE(0);
err:
kfree(buffer.pointer);
- return status;
+ return_VALUE(status);
}
static int
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->dev->handle, "_BCM", &args, NULL);
+ status = acpi_evaluate_object(device->handle, "_BCM", &args, NULL);
printk(KERN_DEBUG "set_level status: %x\n", status);
- return status;
+ return_VALUE(status);
}
static int
unsigned long *level)
{
int status;
+ ACPI_FUNCTION_TRACE("acpi_video_device_lcd_get_level_current");
- status = acpi_evaluate_integer(device->dev->handle, "_BQC", NULL, level);
+ status = acpi_evaluate_integer(device->handle, "_BQC", NULL, level);
- return status;
+ return_VALUE(status);
}
static int
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 -ENODEV;
+ return_VALUE(-ENODEV);
if (length == 128)
arg0.integer.value = 1;
else if (length == 256)
arg0.integer.value = 2;
else
- return -EINVAL;
+ return_VALUE(-EINVAL);
- status = acpi_evaluate_object(device->dev->handle, "_DDC", &args, &buffer);
+ status = acpi_evaluate_object(device->handle, "_DDC", &args, &buffer);
if (ACPI_FAILURE(status))
- return -ENODEV;
+ return_VALUE(-ENODEV);
obj = (union acpi_object *)buffer.pointer;
if (obj && obj->type == ACPI_TYPE_BUFFER)
*edid = obj;
else {
- printk(KERN_ERR PREFIX "Invalid _DDC data\n");
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _DDC data\n"));
status = -EFAULT;
kfree(obj);
}
- return status;
+ return_VALUE(status);
}
/* bus */
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->device->handle, "_SPD", &args, &tmp);
+ status = acpi_evaluate_integer(video->handle, "_SPD", &args, &tmp);
if (ACPI_SUCCESS(status))
status = tmp ? (-EINVAL) : (AE_OK);
- return status;
+ return_VALUE(status);
}
static int
{
int status;
- status = acpi_evaluate_integer(video->device->handle, "_GPD", NULL, id);
+ ACPI_FUNCTION_TRACE("acpi_video_bus_get_POST");
- return status;
+ status = acpi_evaluate_integer(video->handle, "_GPD", NULL, id);
+
+ return_VALUE(status);
}
static int
unsigned long *options)
{
int status;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_POST_options");
- status = acpi_evaluate_integer(video->device->handle, "_VPO", NULL, options);
+ status = acpi_evaluate_integer(video->handle, "_VPO", NULL, options);
*options &= 3;
- return status;
+ return_VALUE(status);
}
/*
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;
}
arg0.integer.value = (lcd_flag << 2) | bios_flag;
video->dos_setting = arg0.integer.value;
- acpi_evaluate_object(video->device->handle, "_DOS", &args, NULL);
+ acpi_evaluate_object(video->handle, "_DOS", &args, NULL);
Failed:
- return status;
+ return_VALUE(status);
}
/*
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->dev->handle, "_ADR", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ADR", &h_dummy1))) {
device->cap._ADR = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BCL", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_BCL", &h_dummy1))) {
device->cap._BCL = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BCM", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_BCM", &h_dummy1))) {
device->cap._BCM = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DDC", &h_dummy1))) {
device->cap._DDC = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DCS", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DCS", &h_dummy1))) {
device->cap._DCS = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DGS", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DGS", &h_dummy1))) {
device->cap._DGS = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DSS", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DSS", &h_dummy1))) {
device->cap._DSS = 1;
}
o = (union acpi_object *)&obj->package.
elements[i];
if (o->type != ACPI_TYPE_INTEGER) {
- printk(KERN_ERR PREFIX "Invalid data\n");
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Invalid data\n"));
continue;
}
br->levels[count] = (u32) o->integer.value;
kfree(obj);
- return;
+ return_VOID;
}
/*
acpi_handle h_dummy1;
memset(&video->cap, 0, 4);
- if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOS", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(video->handle, "_DOS", &h_dummy1))) {
video->cap._DOS = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_DOD", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(video->handle, "_DOD", &h_dummy1))) {
video->cap._DOD = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_ROM", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(video->handle, "_ROM", &h_dummy1))) {
video->cap._ROM = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_GPD", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(video->handle, "_GPD", &h_dummy1))) {
video->cap._GPD = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_SPD", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(video->handle, "_SPD", &h_dummy1))) {
video->cap._SPD = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(video->device->handle, "_VPO", &h_dummy1))) {
+ if (ACPI_SUCCESS(acpi_get_handle(video->handle, "_VPO", &h_dummy1))) {
video->cap._VPO = 1;
}
}
{
acpi_status status = -ENOENT;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_check");
if (!video)
- return -EINVAL;
+ return_VALUE(-EINVAL);
/* Since there is no HID, CID and so on for VGA driver, we have
* to check well known required nodes.
status = 0;
}
- return status;
+ return_VALUE(status);
}
/* --------------------------------------------------------------------------
struct acpi_video_device *dev =
(struct acpi_video_device *)seq->private;
+ ACPI_FUNCTION_TRACE("acpi_video_device_info_seq_show");
if (!dev)
goto end;
seq_printf(seq, "known by bios: %s\n", dev->flags.bios ? "yes" : "no");
end:
- return 0;
+ return_VALUE(0);
}
static int
(struct acpi_video_device *)seq->private;
unsigned long state;
+ ACPI_FUNCTION_TRACE("acpi_video_device_state_seq_show");
if (!dev)
goto end;
seq_printf(seq, "<not supported>\n");
end:
- return 0;
+ return_VALUE(0);
}
static int
char str[12] = { 0 };
u32 state = 0;
+ ACPI_FUNCTION_TRACE("acpi_video_device_write_state");
if (!dev || count + 1 > sizeof str)
- return -EINVAL;
+ return_VALUE(-EINVAL);
if (copy_from_user(str, buffer, count))
- return -EFAULT;
+ return_VALUE(-EFAULT);
str[count] = 0;
state = simple_strtoul(str, NULL, 0);
status = acpi_video_device_set_state(dev, state);
if (status)
- return -EFAULT;
+ return_VALUE(-EFAULT);
- return count;
+ return_VALUE(count);
}
static int
(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 0;
+ return_VALUE(0);
}
seq_printf(seq, "levels: ");
seq_printf(seq, " %d", dev->brightness->levels[i]);
seq_printf(seq, "\ncurrent: %d\n", dev->brightness->curr);
- return 0;
+ return_VALUE(0);
}
static int
unsigned int level = 0;
int i;
+ ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
if (!dev || !dev->brightness || count + 1 > sizeof str)
- return -EINVAL;
+ return_VALUE(-EINVAL);
if (copy_from_user(str, buffer, count))
- return -EFAULT;
+ return_VALUE(-EFAULT);
str[count] = 0;
level = simple_strtoul(str, NULL, 0);
if (level > 100)
- return -EFAULT;
+ return_VALUE(-EFAULT);
/* validate though the list of available levels */
for (i = 0; i < dev->brightness->count; i++)
break;
}
- return count;
+ return_VALUE(count);
}
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;
else
kfree(edid);
- return 0;
+ return_VALUE(0);
}
static int
struct proc_dir_entry *entry = NULL;
struct acpi_video_device *vid_dev;
+ ACPI_FUNCTION_TRACE("acpi_video_device_add_fs");
if (!device)
- return -ENODEV;
+ return_VALUE(-ENODEV);
vid_dev = (struct acpi_video_device *)acpi_driver_data(device);
if (!vid_dev)
- return -ENODEV;
+ return_VALUE(-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 -ENODEV;
+ return_VALUE(-ENODEV);
acpi_device_dir(device)->owner = THIS_MODULE;
}
/* 'info' [R] */
entry = create_proc_entry("info", S_IRUGO, acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'info' fs entry\n"));
else {
entry->proc_fops = &acpi_video_device_info_fops;
entry->data = acpi_driver_data(device);
create_proc_entry("state", S_IFREG | S_IRUGO | S_IWUSR,
acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'state' fs entry\n"));
else {
acpi_video_device_state_fops.write = acpi_video_device_write_state;
entry->proc_fops = &acpi_video_device_state_fops;
create_proc_entry("brightness", S_IFREG | S_IRUGO | S_IWUSR,
acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'brightness' fs entry\n"));
else {
acpi_video_device_brightness_fops.write = acpi_video_device_write_brightness;
entry->proc_fops = &acpi_video_device_brightness_fops;
/* 'EDID' [R] */
entry = create_proc_entry("EDID", S_IRUGO, acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'brightness' fs entry\n"));
else {
entry->proc_fops = &acpi_video_device_EDID_fops;
entry->data = acpi_driver_data(device);
entry->owner = THIS_MODULE;
}
- return 0;
+ return_VALUE(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 -ENODEV;
+ return_VALUE(-ENODEV);
if (acpi_device_dir(device)) {
remove_proc_entry("info", acpi_device_dir(device));
acpi_device_dir(device) = NULL;
}
- return 0;
+ return_VALUE(0);
}
/* video bus */
{
struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_info_seq_show");
if (!video)
goto end;
video->flags.post ? "yes" : "no");
end:
- return 0;
+ return_VALUE(0);
}
static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file)
{
struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_ROM_seq_show");
if (!video)
goto end;
seq_printf(seq, "<TODO>\n");
end:
- return 0;
+ return_VALUE(0);
}
static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file)
unsigned long options;
int status;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_POST_info_seq_show");
if (!video)
goto end;
} else
seq_printf(seq, "<not supported>\n");
end:
- return 0;
+ return_VALUE(0);
}
static int
int status;
unsigned long id;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_POST_seq_show");
if (!video)
goto end;
seq_printf(seq, "device posted is <%s>\n", device_decode[id & 3]);
end:
- return 0;
+ return_VALUE(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 0;
+ return_VALUE(0);
}
static int acpi_video_bus_POST_open_fs(struct inode *inode, 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 -EINVAL;
+ return_VALUE(-EINVAL);
status = acpi_video_bus_POST_options(video, &options);
if (!ACPI_SUCCESS(status))
- return -EINVAL;
+ return_VALUE(-EINVAL);
if (copy_from_user(str, buffer, count))
- return -EFAULT;
+ return_VALUE(-EFAULT);
str[count] = 0;
opt = strtoul(str, NULL, 0);
if (opt > 3)
- return -EFAULT;
+ return_VALUE(-EFAULT);
/* just in case an OEM 'forget' the motherboard... */
options |= 1;
if (options & (1ul << opt)) {
status = acpi_video_bus_set_POST(video, opt);
if (!ACPI_SUCCESS(status))
- return -EFAULT;
+ return_VALUE(-EFAULT);
}
- return count;
+ return_VALUE(count);
}
static ssize_t
char str[12] = { 0 };
unsigned long opt;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_write_DOS");
if (!video || count + 1 > sizeof str)
- return -EINVAL;
+ return_VALUE(-EINVAL);
if (copy_from_user(str, buffer, count))
- return -EFAULT;
+ return_VALUE(-EFAULT);
str[count] = 0;
opt = strtoul(str, NULL, 0);
if (opt > 7)
- return -EFAULT;
+ return_VALUE(-EFAULT);
status = acpi_video_bus_DOS(video, opt & 0x3, (opt & 0x4) >> 2);
if (!ACPI_SUCCESS(status))
- return -EFAULT;
+ return_VALUE(-EFAULT);
- return count;
+ return_VALUE(count);
}
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);
acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
acpi_video_dir);
if (!acpi_device_dir(device))
- return -ENODEV;
+ return_VALUE(-ENODEV);
video->dir = acpi_device_dir(device);
acpi_device_dir(device)->owner = THIS_MODULE;
}
/* 'info' [R] */
entry = create_proc_entry("info", S_IRUGO, acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'info' fs entry\n"));
else {
entry->proc_fops = &acpi_video_bus_info_fops;
entry->data = acpi_driver_data(device);
/* 'ROM' [R] */
entry = create_proc_entry("ROM", S_IRUGO, acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'ROM' fs entry\n"));
else {
entry->proc_fops = &acpi_video_bus_ROM_fops;
entry->data = acpi_driver_data(device);
entry =
create_proc_entry("POST_info", S_IRUGO, acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'POST_info' fs entry\n"));
else {
entry->proc_fops = &acpi_video_bus_POST_info_fops;
entry->data = acpi_driver_data(device);
create_proc_entry("POST", S_IFREG | S_IRUGO | S_IRUSR,
acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'POST' fs entry\n"));
else {
acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
entry->proc_fops = &acpi_video_bus_POST_fops;
create_proc_entry("DOS", S_IFREG | S_IRUGO | S_IRUSR,
acpi_device_dir(device));
if (!entry)
- return -ENODEV;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Unable to create 'DOS' fs entry\n"));
else {
acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
entry->proc_fops = &acpi_video_bus_DOS_fops;
entry->owner = THIS_MODULE;
}
- return 0;
+ return_VALUE(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);
acpi_device_dir(device) = NULL;
}
- return 0;
+ return_VALUE(0);
}
/* --------------------------------------------------------------------------
struct acpi_video_bus *video)
{
unsigned long device_id;
- int status;
+ int status, result;
struct acpi_video_device *data;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_get_one_device");
if (!device || !video)
- return -EINVAL;
+ return_VALUE(-EINVAL);
status =
acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
data = kmalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
if (!data)
- return -ENOMEM;
+ return_VALUE(-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;
acpi_video_device_bind(video, data);
acpi_video_device_find_cap(data);
- status = acpi_install_notify_handler(device->handle,
+ status = acpi_install_notify_handler(data->handle,
ACPI_DEVICE_NOTIFY,
acpi_video_device_notify,
data);
if (ACPI_FAILURE(status)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Error installing notify handler\n"));
- if(data->brightness)
- kfree(data->brightness->levels);
- kfree(data->brightness);
- kfree(data);
- return -ENODEV;
+ result = -ENODEV;
+ goto end;
}
down(&video->sem);
acpi_video_device_add_fs(device);
- return 0;
+ return_VALUE(0);
}
- return -ENOENT;
+ end:
+ return_VALUE(-ENOENT);
}
/*
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
union acpi_object *dod = NULL;
union acpi_object *obj;
- status = acpi_evaluate_object(video->device->handle, "_DOD", NULL, &buffer);
+ 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 status;
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _DOD\n"));
+ return_VALUE(status);
}
dod = (union acpi_object *)buffer.pointer;
if (!dod || (dod->type != ACPI_TYPE_PACKAGE)) {
- ACPI_EXCEPTION((AE_INFO, status, "Invalid _DOD data"));
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _DOD data\n"));
status = -EFAULT;
goto out;
}
obj = (union acpi_object *)&dod->package.elements[i];
if (obj->type != ACPI_TYPE_INTEGER) {
- printk(KERN_ERR PREFIX "Invalid _DOD data\n");
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Invalid _DOD data\n"));
active_device_list[i].value.int_val =
ACPI_VIDEO_HEAD_INVALID;
}
video->attached_array = active_device_list;
video->attached_count = count;
out:
- kfree(buffer.pointer);
- return status;
+ acpi_os_free(buffer.pointer);
+ return_VALUE(status);
}
/*
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);
break;
}
- return status;
+ return_VALUE(status);
}
static int
int status = 0;
struct list_head *node, *next;
+ ACPI_FUNCTION_TRACE("acpi_video_get_devices");
acpi_video_device_enumerate(video);
status = acpi_video_bus_get_one_device(dev, video);
if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status, "Cant attach device"));
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+ "Cant attach device\n"));
continue;
}
}
- return status;
+ return_VALUE(status);
}
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 -ENOENT;
+ return_VALUE(-ENOENT);
video = device->video;
up(&video->sem);
acpi_video_device_remove_fs(device->dev);
- status = acpi_remove_notify_handler(device->dev->handle,
+ 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"));
- return 0;
+ return_VALUE(0);
}
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 =
printk(KERN_WARNING PREFIX
"hhuuhhuu bug in acpi video driver.\n");
- if (data->brightness)
- kfree(data->brightness->levels);
kfree(data->brightness);
+
kfree(data);
}
- return 0;
+ return_VALUE(0);
}
/* acpi_video interface */
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;
+ return_VOID;
- device = video->device;
+ if (acpi_bus_get_device(handle, &device))
+ return_VOID;
switch (event) {
case ACPI_VIDEO_NOTIFY_SWITCH: /* User request that a switch occur,
break;
}
- return;
+ return_VOID;
}
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;
+ return_VOID;
- device = video_device->dev;
+ if (acpi_bus_get_device(handle, &device))
+ return_VOID;
switch (event) {
case ACPI_VIDEO_NOTIFY_SWITCH: /* change in status (cycle output device) */
"Unsupported event [0x%x]\n", event));
break;
}
- return;
+ return_VOID;
}
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 -EINVAL;
+ return_VALUE(-EINVAL);
video = kmalloc(sizeof(struct acpi_video_bus), GFP_KERNEL);
if (!video)
- return -ENOMEM;
+ return_VALUE(-ENOMEM);
memset(video, 0, sizeof(struct acpi_video_bus));
- video->device = device;
+ video->handle = device->handle;
strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
acpi_driver_data(device) = video;
acpi_video_bus_get_devices(video, device);
acpi_video_bus_start_devices(video);
- status = acpi_install_notify_handler(device->handle,
+ status = acpi_install_notify_handler(video->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;
}
video->flags.post ? "yes" : "no");
end:
- if (result)
+ if (result) {
+ acpi_video_bus_remove_fs(device);
kfree(video);
+ }
- return result;
+ return_VALUE(result);
}
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 -EINVAL;
+ return_VALUE(-EINVAL);
video = (struct acpi_video_bus *)acpi_driver_data(device);
acpi_video_bus_stop_devices(video);
- status = acpi_remove_notify_handler(video->device->handle,
+ 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"));
acpi_video_bus_put_devices(video);
acpi_video_bus_remove_fs(device);
kfree(video->attached_array);
kfree(video);
- return 0;
+ return_VALUE(0);
}
static int
acpi_handle h_dummy2;
acpi_handle h_dummy3;
+ ACPI_FUNCTION_TRACE("acpi_video_bus_match");
if (!device || !driver)
- return -EINVAL;
+ return_VALUE(-EINVAL);
/* Since there is no HID, CID for ACPI Video drivers, we have
* to check well known required nodes for each feature we support.
/* 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 0;
+ return_VALUE(0);
/* Does this device able to retrieve a video ROM ? */
if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy1)))
- return 0;
+ return_VALUE(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 0;
+ return_VALUE(0);
- return -ENODEV;
+ return_VALUE(-ENODEV);
}
static int __init acpi_video_init(void)
{
int result = 0;
+ ACPI_FUNCTION_TRACE("acpi_video_init");
/*
acpi_dbg_level = 0xFFFFFFFF;
acpi_video_dir = proc_mkdir(ACPI_VIDEO_CLASS, acpi_root_dir);
if (!acpi_video_dir)
- return -ENODEV;
+ return_VALUE(-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 -ENODEV;
+ return_VALUE(-ENODEV);
}
- return 0;
+ return_VALUE(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;
+ return_VOID;
}
module_init(acpi_video_init);
git://git.onelab.eu / linux-2.6.git / blobdiff