forked from luck/tmp_suning_uos_patched
Pull style into test branch
Conflicts: drivers/acpi/button.c drivers/acpi/ec.c drivers/acpi/osl.c drivers/acpi/sbs.c
This commit is contained in:
commit
cece901481
|
@ -109,7 +109,7 @@ static struct proc_dir_entry *acpi_ac_dir;
|
|||
|
||||
static int acpi_ac_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_ac *ac = (struct acpi_ac *)seq->private;
|
||||
struct acpi_ac *ac = seq->private;
|
||||
|
||||
|
||||
if (!ac)
|
||||
|
@ -187,7 +187,7 @@ static int acpi_ac_remove_fs(struct acpi_device *device)
|
|||
|
||||
static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct acpi_ac *ac = (struct acpi_ac *)data;
|
||||
struct acpi_ac *ac = data;
|
||||
struct acpi_device *device = NULL;
|
||||
|
||||
|
||||
|
@ -269,7 +269,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
ac = (struct acpi_ac *)acpi_driver_data(device);
|
||||
ac = acpi_driver_data(device);
|
||||
|
||||
status = acpi_remove_notify_handler(device->handle,
|
||||
ACPI_ALL_NOTIFY, acpi_ac_notify);
|
||||
|
|
|
@ -429,7 +429,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
mem_device = (struct acpi_memory_device *)acpi_driver_data(device);
|
||||
mem_device = acpi_driver_data(device);
|
||||
kfree(mem_device);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -1146,7 +1146,7 @@ static int asus_hotk_get_info(void)
|
|||
if (ACPI_FAILURE(status))
|
||||
printk(KERN_WARNING " Couldn't get the DSDT table header\n");
|
||||
else
|
||||
asus_info = (struct acpi_table_header *)dsdt.pointer;
|
||||
asus_info = dsdt.pointer;
|
||||
|
||||
/* We have to write 0 on init this far for all ASUS models */
|
||||
if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
|
||||
|
@ -1168,7 +1168,7 @@ static int asus_hotk_get_info(void)
|
|||
* asus_model_match() and try something completely different.
|
||||
*/
|
||||
if (buffer.pointer) {
|
||||
model = (union acpi_object *)buffer.pointer;
|
||||
model = buffer.pointer;
|
||||
switch (model->type) {
|
||||
case ACPI_TYPE_STRING:
|
||||
string = model->string.pointer;
|
||||
|
@ -1264,8 +1264,7 @@ static int asus_hotk_add(struct acpi_device *device)
|
|||
printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
|
||||
ASUS_ACPI_VERSION);
|
||||
|
||||
hotk =
|
||||
(struct asus_hotk *)kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
|
||||
hotk = kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
|
||||
if (!hotk)
|
||||
return -ENOMEM;
|
||||
memset(hotk, 0, sizeof(struct asus_hotk));
|
||||
|
|
|
@ -149,7 +149,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
package = (union acpi_object *)buffer.pointer;
|
||||
package = buffer.pointer;
|
||||
|
||||
/* Extract Package Data */
|
||||
|
||||
|
@ -179,7 +179,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
|
|||
kfree(buffer.pointer);
|
||||
|
||||
if (!result)
|
||||
(*bif) = (struct acpi_battery_info *)data.pointer;
|
||||
(*bif) = data.pointer;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
@ -209,7 +209,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
package = (union acpi_object *)buffer.pointer;
|
||||
package = buffer.pointer;
|
||||
|
||||
/* Extract Package Data */
|
||||
|
||||
|
@ -239,7 +239,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
|
|||
kfree(buffer.pointer);
|
||||
|
||||
if (!result)
|
||||
(*bst) = (struct acpi_battery_status *)data.pointer;
|
||||
(*bst) = data.pointer;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
@ -334,7 +334,7 @@ static struct proc_dir_entry *acpi_battery_dir;
|
|||
static int acpi_battery_read_info(struct seq_file *seq, void *offset)
|
||||
{
|
||||
int result = 0;
|
||||
struct acpi_battery *battery = (struct acpi_battery *)seq->private;
|
||||
struct acpi_battery *battery = seq->private;
|
||||
struct acpi_battery_info *bif = NULL;
|
||||
char *units = "?";
|
||||
|
||||
|
@ -418,7 +418,7 @@ static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
|
|||
static int acpi_battery_read_state(struct seq_file *seq, void *offset)
|
||||
{
|
||||
int result = 0;
|
||||
struct acpi_battery *battery = (struct acpi_battery *)seq->private;
|
||||
struct acpi_battery *battery = seq->private;
|
||||
struct acpi_battery_status *bst = NULL;
|
||||
char *units = "?";
|
||||
|
||||
|
@ -494,7 +494,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
|
|||
|
||||
static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_battery *battery = (struct acpi_battery *)seq->private;
|
||||
struct acpi_battery *battery = seq->private;
|
||||
char *units = "?";
|
||||
|
||||
|
||||
|
@ -531,8 +531,8 @@ acpi_battery_write_alarm(struct file *file,
|
|||
{
|
||||
int result = 0;
|
||||
char alarm_string[12] = { '\0' };
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_battery *battery = (struct acpi_battery *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_battery *battery = m->private;
|
||||
|
||||
|
||||
if (!battery || (count > sizeof(alarm_string) - 1))
|
||||
|
@ -658,7 +658,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device)
|
|||
|
||||
static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct acpi_battery *battery = (struct acpi_battery *)data;
|
||||
struct acpi_battery *battery = data;
|
||||
struct acpi_device *device = NULL;
|
||||
|
||||
|
||||
|
@ -742,7 +742,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
battery = (struct acpi_battery *)acpi_driver_data(device);
|
||||
battery = acpi_driver_data(device);
|
||||
|
||||
status = acpi_remove_notify_handler(device->handle,
|
||||
ACPI_ALL_NOTIFY,
|
||||
|
|
|
@ -117,7 +117,7 @@ static int acpi_container_remove(struct acpi_device *device, int type)
|
|||
acpi_status status = AE_OK;
|
||||
struct acpi_container *pc = NULL;
|
||||
|
||||
pc = (struct acpi_container *)acpi_driver_data(device);
|
||||
pc = acpi_driver_data(device);
|
||||
kfree(pc);
|
||||
return status;
|
||||
}
|
||||
|
|
|
@ -565,7 +565,7 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
|
|||
*/
|
||||
static void dock_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct dock_station *ds = (struct dock_station *)data;
|
||||
struct dock_station *ds = data;
|
||||
|
||||
switch (event) {
|
||||
case ACPI_NOTIFY_BUS_CHECK:
|
||||
|
@ -616,7 +616,7 @@ find_dock_devices(acpi_handle handle, u32 lvl, void *context, void **rv)
|
|||
{
|
||||
acpi_status status;
|
||||
acpi_handle tmp;
|
||||
struct dock_station *ds = (struct dock_station *)context;
|
||||
struct dock_station *ds = context;
|
||||
struct dock_dependent_device *dd;
|
||||
|
||||
status = acpi_bus_get_ejd(handle, &tmp);
|
||||
|
@ -792,7 +792,7 @@ static int dock_remove(void)
|
|||
static acpi_status
|
||||
find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
|
||||
{
|
||||
int *count = (int *)context;
|
||||
int *count = context;
|
||||
acpi_status status = AE_OK;
|
||||
|
||||
if (is_dock(handle)) {
|
||||
|
|
|
@ -99,8 +99,8 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,
|
|||
size_t count, loff_t * ppos)
|
||||
{
|
||||
int result = 0;
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_fan *fan = (struct acpi_fan *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_fan *fan = m->private;
|
||||
char state_string[12] = { '\0' };
|
||||
|
||||
|
||||
|
@ -229,7 +229,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
fan = (struct acpi_fan *)acpi_driver_data(device);
|
||||
fan = acpi_driver_data(device);
|
||||
|
||||
acpi_fan_remove_fs(device);
|
||||
|
||||
|
|
|
@ -96,7 +96,7 @@ struct acpi_find_pci_root {
|
|||
static acpi_status
|
||||
do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
|
||||
{
|
||||
unsigned long *busnr = (unsigned long *)data;
|
||||
unsigned long *busnr = data;
|
||||
struct acpi_resource_address64 address;
|
||||
|
||||
if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
|
||||
|
@ -221,7 +221,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
|
|||
acpi_status status;
|
||||
struct acpi_device_info *info;
|
||||
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
|
||||
struct acpi_find_child *find = (struct acpi_find_child *)context;
|
||||
struct acpi_find_child *find = context;
|
||||
|
||||
status = acpi_get_object_info(handle, &buffer);
|
||||
if (ACPI_SUCCESS(status)) {
|
||||
|
|
|
@ -265,8 +265,7 @@ static char *format_result(union acpi_object *object)
|
|||
|
||||
static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_polling_hotkey *poll_hotkey =
|
||||
(struct acpi_polling_hotkey *)seq->private;
|
||||
struct acpi_polling_hotkey *poll_hotkey = seq->private;
|
||||
char *buf;
|
||||
|
||||
|
||||
|
@ -577,7 +576,7 @@ init_poll_hotkey_device(union acpi_hotkey *key, char **config_entry,
|
|||
if (ACPI_FAILURE(status))
|
||||
goto do_fail_zero;
|
||||
key->poll_hotkey.poll_result =
|
||||
(union acpi_object *)kmalloc(sizeof(union acpi_object), GFP_KERNEL);
|
||||
kmalloc(sizeof(union acpi_object), GFP_KERNEL);
|
||||
if (!key->poll_hotkey.poll_result)
|
||||
goto do_fail_zero;
|
||||
return AE_OK;
|
||||
|
|
|
@ -393,7 +393,7 @@ static void __exit acpi_ec_hc_exit(void)
|
|||
|
||||
struct acpi_ec_hc *acpi_get_ec_hc(struct acpi_device *device)
|
||||
{
|
||||
return ((struct acpi_ec_hc *)acpi_driver_data(device->parent));
|
||||
return acpi_driver_data(device->parent);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_get_ec_hc);
|
||||
|
|
|
@ -2417,7 +2417,7 @@ static struct ibm_struct ibms[] = {
|
|||
static int dispatch_read(char *page, char **start, off_t off, int count,
|
||||
int *eof, void *data)
|
||||
{
|
||||
struct ibm_struct *ibm = (struct ibm_struct *)data;
|
||||
struct ibm_struct *ibm = data;
|
||||
int len;
|
||||
|
||||
if (!ibm || !ibm->read)
|
||||
|
@ -2442,7 +2442,7 @@ static int dispatch_read(char *page, char **start, off_t off, int count,
|
|||
static int dispatch_write(struct file *file, const char __user * userbuf,
|
||||
unsigned long count, void *data)
|
||||
{
|
||||
struct ibm_struct *ibm = (struct ibm_struct *)data;
|
||||
struct ibm_struct *ibm = data;
|
||||
char *kernbuf;
|
||||
int ret;
|
||||
|
||||
|
@ -2471,7 +2471,7 @@ static int dispatch_write(struct file *file, const char __user * userbuf,
|
|||
|
||||
static void dispatch_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct ibm_struct *ibm = (struct ibm_struct *)data;
|
||||
struct ibm_struct *ibm = data;
|
||||
|
||||
if (!ibm || !ibm->notify)
|
||||
return;
|
||||
|
|
|
@ -248,7 +248,7 @@ int acpi_get_pxm(acpi_handle h)
|
|||
handle = phandle;
|
||||
status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
|
||||
if (ACPI_SUCCESS(status))
|
||||
return (int)pxm;
|
||||
return pxm;
|
||||
status = acpi_get_parent(handle, &phandle);
|
||||
} while (ACPI_SUCCESS(status));
|
||||
return -1;
|
||||
|
|
|
@ -568,6 +568,7 @@ void acpi_os_derive_pci_id(acpi_handle rhandle, /* upper bound */
|
|||
static void acpi_os_execute_deferred(struct work_struct *work)
|
||||
{
|
||||
struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
|
||||
|
||||
if (!dpc) {
|
||||
printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
|
||||
return;
|
||||
|
@ -1051,7 +1052,7 @@ acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
|
|||
|
||||
acpi_status acpi_os_purge_cache(acpi_cache_t * cache)
|
||||
{
|
||||
(void)kmem_cache_shrink(cache);
|
||||
kmem_cache_shrink(cache);
|
||||
return (AE_OK);
|
||||
}
|
||||
|
||||
|
|
|
@ -281,7 +281,7 @@ int acpi_pci_unbind(struct acpi_device *device)
|
|||
if (!device || !device->parent)
|
||||
return -EINVAL;
|
||||
|
||||
pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
|
||||
pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
|
||||
if (!pathname)
|
||||
return -ENOMEM;
|
||||
memset(pathname, 0, ACPI_PATHNAME_MAX);
|
||||
|
@ -332,7 +332,7 @@ acpi_pci_bind_root(struct acpi_device *device,
|
|||
struct acpi_buffer buffer = { 0, NULL };
|
||||
|
||||
|
||||
pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
|
||||
pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
|
||||
if (!pathname)
|
||||
return -ENOMEM;
|
||||
memset(pathname, 0, ACPI_PATHNAME_MAX);
|
||||
|
|
|
@ -161,7 +161,7 @@ int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus)
|
|||
static int first_time = 1;
|
||||
|
||||
|
||||
pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
|
||||
pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
|
||||
if (!pathname)
|
||||
return -ENOMEM;
|
||||
memset(pathname, 0, ACPI_PATHNAME_MAX);
|
||||
|
|
|
@ -103,7 +103,7 @@ DEFINE_MUTEX(acpi_link_lock);
|
|||
static acpi_status
|
||||
acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
|
||||
{
|
||||
struct acpi_pci_link *link = (struct acpi_pci_link *)context;
|
||||
struct acpi_pci_link *link = context;
|
||||
u32 i = 0;
|
||||
|
||||
|
||||
|
@ -613,7 +613,7 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
|
|||
return -1;
|
||||
}
|
||||
|
||||
link = (struct acpi_pci_link *)acpi_driver_data(device);
|
||||
link = acpi_driver_data(device);
|
||||
if (!link) {
|
||||
printk(KERN_ERR PREFIX "Invalid link context\n");
|
||||
return -1;
|
||||
|
@ -668,7 +668,7 @@ int acpi_pci_link_free_irq(acpi_handle handle)
|
|||
return -1;
|
||||
}
|
||||
|
||||
link = (struct acpi_pci_link *)acpi_driver_data(device);
|
||||
link = acpi_driver_data(device);
|
||||
if (!link) {
|
||||
printk(KERN_ERR PREFIX "Invalid link context\n");
|
||||
return -1;
|
||||
|
@ -808,7 +808,7 @@ static int acpi_pci_link_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
link = (struct acpi_pci_link *)acpi_driver_data(device);
|
||||
link = acpi_driver_data(device);
|
||||
|
||||
mutex_lock(&acpi_link_lock);
|
||||
list_del(&link->node);
|
||||
|
|
|
@ -119,7 +119,7 @@ EXPORT_SYMBOL(acpi_pci_unregister_driver);
|
|||
static acpi_status
|
||||
get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
|
||||
{
|
||||
int *busnr = (int *)data;
|
||||
int *busnr = data;
|
||||
struct acpi_resource_address64 address;
|
||||
|
||||
if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
|
||||
|
@ -331,7 +331,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
root = (struct acpi_pci_root *)acpi_driver_data(device);
|
||||
root = acpi_driver_data(device);
|
||||
|
||||
kfree(root);
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@ acpi_power_get_context(acpi_handle handle,
|
|||
return result;
|
||||
}
|
||||
|
||||
*resource = (struct acpi_power_resource *)acpi_driver_data(device);
|
||||
*resource = acpi_driver_data(device);
|
||||
if (!resource)
|
||||
return -ENODEV;
|
||||
|
||||
|
@ -442,7 +442,7 @@ static int acpi_power_seq_show(struct seq_file *seq, void *offset)
|
|||
struct acpi_power_resource *resource = NULL;
|
||||
|
||||
|
||||
resource = (struct acpi_power_resource *)seq->private;
|
||||
resource = seq->private;
|
||||
|
||||
if (!resource)
|
||||
goto end;
|
||||
|
@ -590,7 +590,7 @@ static int acpi_power_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
resource = (struct acpi_power_resource *)acpi_driver_data(device);
|
||||
resource = acpi_driver_data(device);
|
||||
|
||||
acpi_power_remove_fs(device);
|
||||
|
||||
|
|
|
@ -277,7 +277,7 @@ static struct proc_dir_entry *acpi_processor_dir = NULL;
|
|||
|
||||
static int acpi_processor_info_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_processor *pr = (struct acpi_processor *)seq->private;
|
||||
struct acpi_processor *pr = seq->private;
|
||||
|
||||
|
||||
if (!pr)
|
||||
|
@ -542,12 +542,12 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
|
|||
* Don't trust it blindly
|
||||
*/
|
||||
if (processor_device_array[pr->id] != NULL &&
|
||||
processor_device_array[pr->id] != (void *)device) {
|
||||
processor_device_array[pr->id] != device) {
|
||||
printk(KERN_WARNING "BIOS reported wrong ACPI id"
|
||||
"for the processor\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
processor_device_array[pr->id] = (void *)device;
|
||||
processor_device_array[pr->id] = device;
|
||||
|
||||
processors[pr->id] = pr;
|
||||
|
||||
|
@ -578,7 +578,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
|
|||
|
||||
static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct acpi_processor *pr = (struct acpi_processor *)data;
|
||||
struct acpi_processor *pr = data;
|
||||
struct acpi_device *device = NULL;
|
||||
|
||||
|
||||
|
@ -637,7 +637,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
pr = (struct acpi_processor *)acpi_driver_data(device);
|
||||
pr = acpi_driver_data(device);
|
||||
|
||||
if (pr->id >= NR_CPUS) {
|
||||
kfree(pr);
|
||||
|
|
|
@ -673,7 +673,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
cst = (union acpi_object *)buffer.pointer;
|
||||
cst = buffer.pointer;
|
||||
|
||||
/* There must be at least 2 elements */
|
||||
if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
|
||||
|
@ -702,14 +702,14 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
|
|||
|
||||
memset(&cx, 0, sizeof(cx));
|
||||
|
||||
element = (union acpi_object *)&(cst->package.elements[i]);
|
||||
element = &(cst->package.elements[i]);
|
||||
if (element->type != ACPI_TYPE_PACKAGE)
|
||||
continue;
|
||||
|
||||
if (element->package.count != 4)
|
||||
continue;
|
||||
|
||||
obj = (union acpi_object *)&(element->package.elements[0]);
|
||||
obj = &(element->package.elements[0]);
|
||||
|
||||
if (obj->type != ACPI_TYPE_BUFFER)
|
||||
continue;
|
||||
|
@ -721,7 +721,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
|
|||
continue;
|
||||
|
||||
/* There should be an easy way to extract an integer... */
|
||||
obj = (union acpi_object *)&(element->package.elements[1]);
|
||||
obj = &(element->package.elements[1]);
|
||||
if (obj->type != ACPI_TYPE_INTEGER)
|
||||
continue;
|
||||
|
||||
|
@ -754,13 +754,13 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
|
|||
}
|
||||
}
|
||||
|
||||
obj = (union acpi_object *)&(element->package.elements[2]);
|
||||
obj = &(element->package.elements[2]);
|
||||
if (obj->type != ACPI_TYPE_INTEGER)
|
||||
continue;
|
||||
|
||||
cx.latency = obj->integer.value;
|
||||
|
||||
obj = (union acpi_object *)&(element->package.elements[3]);
|
||||
obj = &(element->package.elements[3]);
|
||||
if (obj->type != ACPI_TYPE_INTEGER)
|
||||
continue;
|
||||
|
||||
|
@ -1029,7 +1029,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
|
|||
|
||||
static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_processor *pr = (struct acpi_processor *)seq->private;
|
||||
struct acpi_processor *pr = seq->private;
|
||||
unsigned int i;
|
||||
|
||||
|
||||
|
|
|
@ -236,7 +236,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
pss = (union acpi_object *)buffer.pointer;
|
||||
pss = buffer.pointer;
|
||||
if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
|
||||
printk(KERN_ERR PREFIX "Invalid _PSS data\n");
|
||||
result = -EFAULT;
|
||||
|
@ -410,7 +410,7 @@ static struct file_operations acpi_processor_perf_fops = {
|
|||
|
||||
static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_processor *pr = (struct acpi_processor *)seq->private;
|
||||
struct acpi_processor *pr = seq->private;
|
||||
int i;
|
||||
|
||||
|
||||
|
@ -451,8 +451,8 @@ acpi_processor_write_performance(struct file *file,
|
|||
size_t count, loff_t * data)
|
||||
{
|
||||
int result = 0;
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_processor *pr = (struct acpi_processor *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_processor *pr = m->private;
|
||||
struct acpi_processor_performance *perf;
|
||||
char state_string[12] = { '\0' };
|
||||
unsigned int new_state = 0;
|
||||
|
@ -551,7 +551,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
psd = (union acpi_object *) buffer.pointer;
|
||||
psd = buffer.pointer;
|
||||
if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
|
||||
result = -EFAULT;
|
||||
|
|
|
@ -208,7 +208,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
|
|||
if (result)
|
||||
return result;
|
||||
|
||||
pr = (struct acpi_processor *)acpi_driver_data(device);
|
||||
pr = acpi_driver_data(device);
|
||||
if (!pr)
|
||||
return -ENODEV;
|
||||
|
||||
|
@ -348,8 +348,8 @@ static ssize_t acpi_processor_write_limit(struct file * file,
|
|||
size_t count, loff_t * data)
|
||||
{
|
||||
int result = 0;
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_processor *pr = (struct acpi_processor *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_processor *pr = m->private;
|
||||
char limit_string[25] = { '\0' };
|
||||
int px = 0;
|
||||
int tx = 0;
|
||||
|
|
|
@ -259,7 +259,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
|
|||
static int acpi_processor_throttling_seq_show(struct seq_file *seq,
|
||||
void *offset)
|
||||
{
|
||||
struct acpi_processor *pr = (struct acpi_processor *)seq->private;
|
||||
struct acpi_processor *pr = seq->private;
|
||||
int i = 0;
|
||||
int result = 0;
|
||||
|
||||
|
@ -307,8 +307,8 @@ static ssize_t acpi_processor_write_throttling(struct file * file,
|
|||
size_t count, loff_t * data)
|
||||
{
|
||||
int result = 0;
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_processor *pr = (struct acpi_processor *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_processor *pr = m->private;
|
||||
char state_string[12] = { '\0' };
|
||||
|
||||
|
||||
|
|
|
@ -923,7 +923,7 @@ static struct proc_dir_entry *acpi_battery_dir = NULL;
|
|||
|
||||
static int acpi_battery_read_info(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_battery *battery = (struct acpi_battery *)seq->private;
|
||||
struct acpi_battery *battery = seq->private;
|
||||
int cscale;
|
||||
int result = 0;
|
||||
|
||||
|
@ -1076,7 +1076,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
|
|||
|
||||
static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_battery *battery = (struct acpi_battery *)seq->private;
|
||||
struct acpi_battery *battery = seq->private;
|
||||
int result = 0;
|
||||
int cscale;
|
||||
|
||||
|
@ -1125,8 +1125,8 @@ static ssize_t
|
|||
acpi_battery_write_alarm(struct file *file, const char __user * buffer,
|
||||
size_t count, loff_t * ppos)
|
||||
{
|
||||
struct seq_file *seq = (struct seq_file *)file->private_data;
|
||||
struct acpi_battery *battery = (struct acpi_battery *)seq->private;
|
||||
struct seq_file *seq = file->private_data;
|
||||
struct acpi_battery *battery = seq->private;
|
||||
char alarm_string[12] = { '\0' };
|
||||
int result, old_alarm, new_alarm;
|
||||
|
||||
|
@ -1160,14 +1160,14 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer,
|
|||
if (result) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"acpi_battery_set_alarm() failed\n"));
|
||||
(void)acpi_battery_set_alarm(battery, old_alarm);
|
||||
acpi_battery_set_alarm(battery, old_alarm);
|
||||
goto end;
|
||||
}
|
||||
result = acpi_battery_get_alarm(battery);
|
||||
if (result) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"acpi_battery_get_alarm() failed\n"));
|
||||
(void)acpi_battery_set_alarm(battery, old_alarm);
|
||||
acpi_battery_set_alarm(battery, old_alarm);
|
||||
goto end;
|
||||
}
|
||||
|
||||
|
@ -1217,7 +1217,7 @@ static struct proc_dir_entry *acpi_ac_dir = NULL;
|
|||
|
||||
static int acpi_ac_read_state(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_sbs *sbs = (struct acpi_sbs *)seq->private;
|
||||
struct acpi_sbs *sbs = seq->private;
|
||||
int result;
|
||||
|
||||
if (sbs->zombie) {
|
||||
|
@ -1302,7 +1302,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
|
|||
battery->init_state = 1;
|
||||
}
|
||||
|
||||
(void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
|
||||
sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
|
||||
|
||||
result = acpi_sbs_generic_add_fs(&battery->battery_entry,
|
||||
acpi_battery_dir,
|
||||
|
@ -1485,7 +1485,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
|
|||
}
|
||||
|
||||
if (old_battery_present != new_battery_present) {
|
||||
(void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
|
||||
sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
|
||||
result = acpi_sbs_generate_event(sbs->device,
|
||||
ACPI_SBS_BATTERY_NOTIFY_STATUS,
|
||||
new_battery_present,
|
||||
|
@ -1498,7 +1498,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
|
|||
}
|
||||
}
|
||||
if (old_remaining_capacity != battery->state.remaining_capacity) {
|
||||
(void)sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
|
||||
sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
|
||||
result = acpi_sbs_generate_event(sbs->device,
|
||||
ACPI_SBS_BATTERY_NOTIFY_STATUS,
|
||||
new_battery_present,
|
||||
|
@ -1659,7 +1659,7 @@ static int acpi_sbs_add(struct acpi_device *device)
|
|||
init_timer(&sbs->update_timer);
|
||||
if (update_mode == QUEUE_UPDATE_MODE) {
|
||||
status = acpi_os_execute(OSL_GPE_HANDLER,
|
||||
acpi_sbs_update_queue, (void *)sbs);
|
||||
acpi_sbs_update_queue, sbs);
|
||||
if (status != AE_OK) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
"acpi_os_execute() failed\n"));
|
||||
|
@ -1685,7 +1685,7 @@ static int acpi_sbs_add(struct acpi_device *device)
|
|||
|
||||
int acpi_sbs_remove(struct acpi_device *device, int type)
|
||||
{
|
||||
struct acpi_sbs *sbs = NULL;
|
||||
struct acpi_sbs *sbs;
|
||||
int id;
|
||||
|
||||
if (!device) {
|
||||
|
|
|
@ -228,7 +228,7 @@ void acpi_table_print_madt_entry(acpi_table_entry_header * header)
|
|||
static int
|
||||
acpi_table_compute_checksum(void *table_pointer, unsigned long length)
|
||||
{
|
||||
u8 *p = (u8 *) table_pointer;
|
||||
u8 *p = table_pointer;
|
||||
unsigned long remains = length;
|
||||
unsigned long sum = 0;
|
||||
|
||||
|
|
|
@ -663,7 +663,7 @@ static void acpi_thermal_run(unsigned long data)
|
|||
static void acpi_thermal_check(void *data)
|
||||
{
|
||||
int result = 0;
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)data;
|
||||
struct acpi_thermal *tz = data;
|
||||
unsigned long sleep_time = 0;
|
||||
int i = 0;
|
||||
struct acpi_thermal_state state;
|
||||
|
@ -778,7 +778,7 @@ static struct proc_dir_entry *acpi_thermal_dir;
|
|||
|
||||
static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
|
||||
struct acpi_thermal *tz = seq->private;
|
||||
|
||||
|
||||
if (!tz)
|
||||
|
@ -813,7 +813,7 @@ static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file)
|
|||
static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
int result = 0;
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
|
||||
struct acpi_thermal *tz = seq->private;
|
||||
|
||||
|
||||
if (!tz)
|
||||
|
@ -837,7 +837,7 @@ static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)
|
|||
|
||||
static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
|
||||
struct acpi_thermal *tz = seq->private;
|
||||
int i = 0;
|
||||
int j = 0;
|
||||
|
||||
|
@ -893,8 +893,8 @@ acpi_thermal_write_trip_points(struct file *file,
|
|||
const char __user * buffer,
|
||||
size_t count, loff_t * ppos)
|
||||
{
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_thermal *tz = m->private;
|
||||
|
||||
char *limit_string;
|
||||
int num, critical, hot, passive;
|
||||
|
@ -953,7 +953,7 @@ acpi_thermal_write_trip_points(struct file *file,
|
|||
|
||||
static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
|
||||
struct acpi_thermal *tz = seq->private;
|
||||
|
||||
|
||||
if (!tz)
|
||||
|
@ -984,8 +984,8 @@ acpi_thermal_write_cooling_mode(struct file *file,
|
|||
const char __user * buffer,
|
||||
size_t count, loff_t * ppos)
|
||||
{
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_thermal *tz = m->private;
|
||||
int result = 0;
|
||||
char mode_string[12] = { '\0' };
|
||||
|
||||
|
@ -1014,7 +1014,7 @@ acpi_thermal_write_cooling_mode(struct file *file,
|
|||
|
||||
static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
|
||||
struct acpi_thermal *tz = seq->private;
|
||||
|
||||
|
||||
if (!tz)
|
||||
|
@ -1043,8 +1043,8 @@ acpi_thermal_write_polling(struct file *file,
|
|||
const char __user * buffer,
|
||||
size_t count, loff_t * ppos)
|
||||
{
|
||||
struct seq_file *m = (struct seq_file *)file->private_data;
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)m->private;
|
||||
struct seq_file *m = file->private_data;
|
||||
struct acpi_thermal *tz = m->private;
|
||||
int result = 0;
|
||||
char polling_string[12] = { '\0' };
|
||||
int seconds = 0;
|
||||
|
@ -1170,7 +1170,7 @@ static int acpi_thermal_remove_fs(struct acpi_device *device)
|
|||
|
||||
static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct acpi_thermal *tz = (struct acpi_thermal *)data;
|
||||
struct acpi_thermal *tz = data;
|
||||
struct acpi_device *device = NULL;
|
||||
|
||||
|
||||
|
@ -1324,7 +1324,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
tz = (struct acpi_thermal *)acpi_driver_data(device);
|
||||
tz = acpi_driver_data(device);
|
||||
|
||||
/* avoid timer adding new defer task */
|
||||
tz->zombie = 1;
|
||||
|
@ -1364,7 +1364,7 @@ static int acpi_thermal_resume(struct acpi_device *device, int state)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
tz = (struct acpi_thermal *)acpi_driver_data(device);
|
||||
tz = acpi_driver_data(device);
|
||||
|
||||
acpi_thermal_get_temperature(tz);
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ acpi_extract_package(union acpi_object *package,
|
|||
return AE_BAD_DATA;
|
||||
}
|
||||
|
||||
format_string = (char *)format->pointer;
|
||||
format_string = format->pointer;
|
||||
|
||||
/*
|
||||
* Calculate size_required.
|
||||
|
@ -361,7 +361,7 @@ acpi_evaluate_reference(acpi_handle handle,
|
|||
if (ACPI_FAILURE(status))
|
||||
goto end;
|
||||
|
||||
package = (union acpi_object *)buffer.pointer;
|
||||
package = buffer.pointer;
|
||||
|
||||
if ((buffer.length == 0) || !package) {
|
||||
printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
|
||||
|
|
|
@ -386,7 +386,7 @@ acpi_video_device_EDID(struct acpi_video_device *device,
|
|||
if (ACPI_FAILURE(status))
|
||||
return -ENODEV;
|
||||
|
||||
obj = (union acpi_object *)buffer.pointer;
|
||||
obj = buffer.pointer;
|
||||
|
||||
if (obj && obj->type == ACPI_TYPE_BUFFER)
|
||||
*edid = obj;
|
||||
|
@ -654,8 +654,7 @@ 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;
|
||||
|
||||
|
||||
if (!dev)
|
||||
|
@ -688,8 +687,7 @@ 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;
|
||||
|
||||
|
||||
|
@ -727,8 +725,8 @@ 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;
|
||||
|
||||
|
@ -754,8 +752,7 @@ acpi_video_device_write_state(struct file *file,
|
|||
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;
|
||||
|
||||
|
||||
|
@ -784,8 +781,8 @@ 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;
|
||||
|
@ -817,8 +814,7 @@ acpi_video_device_write_brightness(struct file *file,
|
|||
|
||||
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;
|
||||
|
@ -866,7 +862,7 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
|
|||
if (!device)
|
||||
return -ENODEV;
|
||||
|
||||
vid_dev = (struct acpi_video_device *)acpi_driver_data(device);
|
||||
vid_dev = acpi_driver_data(device);
|
||||
if (!vid_dev)
|
||||
return -ENODEV;
|
||||
|
||||
|
@ -931,7 +927,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
|
|||
{
|
||||
struct acpi_video_device *vid_dev;
|
||||
|
||||
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 -ENODEV;
|
||||
|
||||
|
@ -950,7 +946,7 @@ static int acpi_video_device_remove_fs(struct acpi_device *device)
|
|||
/* 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;
|
||||
|
||||
|
||||
if (!video)
|
||||
|
@ -975,7 +971,7 @@ 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;
|
||||
|
||||
|
||||
if (!video)
|
||||
|
@ -995,7 +991,7 @@ 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;
|
||||
|
||||
|
@ -1033,7 +1029,7 @@ 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;
|
||||
|
||||
|
@ -1054,7 +1050,7 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
|
|||
|
||||
static int acpi_video_bus_DOS_seq_show(struct seq_file *seq, void *offset)
|
||||
{
|
||||
struct acpi_video_bus *video = (struct acpi_video_bus *)seq->private;
|
||||
struct acpi_video_bus *video = seq->private;
|
||||
|
||||
|
||||
seq_printf(seq, "DOS setting: <%d>\n", video->dos_setting);
|
||||
|
@ -1079,8 +1075,8 @@ 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;
|
||||
|
||||
|
@ -1119,8 +1115,8 @@ 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;
|
||||
|
||||
|
@ -1150,7 +1146,7 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
|
|||
struct acpi_video_bus *video;
|
||||
|
||||
|
||||
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),
|
||||
|
@ -1226,7 +1222,7 @@ static int acpi_video_bus_remove_fs(struct acpi_device *device)
|
|||
struct acpi_video_bus *video;
|
||||
|
||||
|
||||
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));
|
||||
|
@ -1403,7 +1399,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
|
|||
return status;
|
||||
}
|
||||
|
||||
dod = (union acpi_object *)buffer.pointer;
|
||||
dod = buffer.pointer;
|
||||
if (!dod || (dod->type != ACPI_TYPE_PACKAGE)) {
|
||||
ACPI_EXCEPTION((AE_INFO, status, "Invalid _DOD data"));
|
||||
status = -EFAULT;
|
||||
|
@ -1426,7 +1422,7 @@ 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) {
|
||||
printk(KERN_ERR PREFIX "Invalid _DOD data\n");
|
||||
|
@ -1612,7 +1608,7 @@ 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;
|
||||
|
||||
printk("video bus notify\n");
|
||||
|
@ -1654,8 +1650,7 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
|
|||
|
||||
static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
|
||||
{
|
||||
struct acpi_video_device *video_device =
|
||||
(struct acpi_video_device *)data;
|
||||
struct acpi_video_device *video_device = data;
|
||||
struct acpi_device *device = NULL;
|
||||
|
||||
|
||||
|
@ -1757,7 +1752,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
|
|||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
|
||||
video = (struct acpi_video_bus *)acpi_driver_data(device);
|
||||
video = acpi_driver_data(device);
|
||||
|
||||
acpi_video_bus_stop_devices(video);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user