projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
acpi
/
battery.c
diff --git
a/drivers/acpi/battery.c
b/drivers/acpi/battery.c
index
6ce9330
..
9810e2a
100644
(file)
--- a/
drivers/acpi/battery.c
+++ b/
drivers/acpi/battery.c
@@
-59,6
+59,9
@@
ACPI_MODULE_NAME("acpi_battery")
MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);
MODULE_LICENSE("GPL");
+extern struct proc_dir_entry *acpi_lock_battery_dir(void);
+extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
+
static int acpi_battery_add(struct acpi_device *device);
static int acpi_battery_remove(struct acpi_device *device, int type);
static int acpi_battery_add(struct acpi_device *device);
static int acpi_battery_remove(struct acpi_device *device, int type);
@@
-171,7
+174,7
@@
acpi_battery_get_info(struct acpi_battery *battery,
}
end:
}
end:
-
acpi_os_
free(buffer.pointer);
+
k
free(buffer.pointer);
if (!result)
(*bif) = (struct acpi_battery_info *)data.pointer;
if (!result)
(*bif) = (struct acpi_battery_info *)data.pointer;
@@
-231,7
+234,7
@@
acpi_battery_get_status(struct acpi_battery *battery,
}
end:
}
end:
-
acpi_os_
free(buffer.pointer);
+
k
free(buffer.pointer);
if (!result)
(*bst) = (struct acpi_battery_status *)data.pointer;
if (!result)
(*bst) = (struct acpi_battery_status *)data.pointer;
@@
-554,7
+557,7
@@
static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);
}
return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);
}
-static struct file_operations acpi_battery_info_ops = {
+static
const
struct file_operations acpi_battery_info_ops = {
.open = acpi_battery_info_open_fs,
.read = seq_read,
.llseek = seq_lseek,
.open = acpi_battery_info_open_fs,
.read = seq_read,
.llseek = seq_lseek,
@@
-562,7
+565,7
@@
static struct file_operations acpi_battery_info_ops = {
.owner = THIS_MODULE,
};
.owner = THIS_MODULE,
};
-static struct file_operations acpi_battery_state_ops = {
+static
const
struct file_operations acpi_battery_state_ops = {
.open = acpi_battery_state_open_fs,
.read = seq_read,
.llseek = seq_lseek,
.open = acpi_battery_state_open_fs,
.read = seq_read,
.llseek = seq_lseek,
@@
-570,7
+573,7
@@
static struct file_operations acpi_battery_state_ops = {
.owner = THIS_MODULE,
};
.owner = THIS_MODULE,
};
-static struct file_operations acpi_battery_alarm_ops = {
+static
const
struct file_operations acpi_battery_alarm_ops = {
.open = acpi_battery_alarm_open_fs,
.read = seq_read,
.write = acpi_battery_write_alarm,
.open = acpi_battery_alarm_open_fs,
.read = seq_read,
.write = acpi_battery_write_alarm,
@@
-665,6
+668,8
@@
static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
switch (event) {
case ACPI_BATTERY_NOTIFY_STATUS:
case ACPI_BATTERY_NOTIFY_INFO:
switch (event) {
case ACPI_BATTERY_NOTIFY_STATUS:
case ACPI_BATTERY_NOTIFY_INFO:
+ case ACPI_NOTIFY_BUS_CHECK:
+ case ACPI_NOTIFY_DEVICE_CHECK:
acpi_battery_check(battery);
acpi_bus_generate_event(device, event, battery->flags.present);
break;
acpi_battery_check(battery);
acpi_bus_generate_event(device, event, battery->flags.present);
break;
@@
-706,7
+711,7
@@
static int acpi_battery_add(struct acpi_device *device)
goto end;
status = acpi_install_notify_handler(device->handle,
goto end;
status = acpi_install_notify_handler(device->handle,
- ACPI_
DEVICE
_NOTIFY,
+ ACPI_
ALL
_NOTIFY,
acpi_battery_notify, battery);
if (ACPI_FAILURE(status)) {
result = -ENODEV;
acpi_battery_notify, battery);
if (ACPI_FAILURE(status)) {
result = -ENODEV;
@@
-738,7
+743,7
@@
static int acpi_battery_remove(struct acpi_device *device, int type)
battery = (struct acpi_battery *)acpi_driver_data(device);
status = acpi_remove_notify_handler(device->handle,
battery = (struct acpi_battery *)acpi_driver_data(device);
status = acpi_remove_notify_handler(device->handle,
- ACPI_
DEVICE
_NOTIFY,
+ ACPI_
ALL
_NOTIFY,
acpi_battery_notify);
acpi_battery_remove_fs(device);
acpi_battery_notify);
acpi_battery_remove_fs(device);
@@
-750,17
+755,18
@@
static int acpi_battery_remove(struct acpi_device *device, int type)
static int __init acpi_battery_init(void)
{
static int __init acpi_battery_init(void)
{
- int result
= 0
;
+ int result;
+ if (acpi_disabled)
+ return -ENODEV;
- acpi_battery_dir =
proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir
);
+ acpi_battery_dir =
acpi_lock_battery_dir(
);
if (!acpi_battery_dir)
return -ENODEV;
if (!acpi_battery_dir)
return -ENODEV;
- acpi_battery_dir->owner = THIS_MODULE;
result = acpi_bus_register_driver(&acpi_battery_driver);
if (result < 0) {
result = acpi_bus_register_driver(&acpi_battery_driver);
if (result < 0) {
-
remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root
_dir);
+
acpi_unlock_battery_dir(acpi_battery
_dir);
return -ENODEV;
}
return -ENODEV;
}
@@
-772,7
+778,7
@@
static void __exit acpi_battery_exit(void)
acpi_bus_unregister_driver(&acpi_battery_driver);
acpi_bus_unregister_driver(&acpi_battery_driver);
-
remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root
_dir);
+
acpi_unlock_battery_dir(acpi_battery
_dir);
return;
}
return;
}