lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: battery: make internal names consistent with battery "state"

Browse Source 
Cleanup -- No functional changes.

Battery state is currently exported in a proc "state" file.
Update associated #defines and routines to be consistent.

Signed-off-by: Vladimir Lebedev <vladimir.p.lebedev@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Vladimir Lebedev
2007-02-20 15:48:06 +03:00
committed by Len Brown
parent 08e15e81a4
commit a1f0eff21e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/acpi/battery.c
View File

@@ -44,7 +44,7 @@
#define ACPI_BATTERY_HID "PNP0C0A" #define ACPI_BATTERY_HID "PNP0C0A"
#define ACPI_BATTERY_DEVICE_NAME "Battery" #define ACPI_BATTERY_DEVICE_NAME "Battery"
#define ACPI_BATTERY_FILE_INFO "info" #define ACPI_BATTERY_FILE_INFO "info"
#define ACPI_BATTERY_FILE_STATUS "state" #define ACPI_BATTERY_FILE_STATE "state"
#define ACPI_BATTERY_FILE_ALARM "alarm" #define ACPI_BATTERY_FILE_ALARM "alarm"
#define ACPI_BATTERY_NOTIFY_STATUS 0x80 #define ACPI_BATTERY_NOTIFY_STATUS 0x80
#define ACPI_BATTERY_NOTIFY_INFO 0x81 #define ACPI_BATTERY_NOTIFY_INFO 0x81
@@ -76,7 +76,7 @@ static struct acpi_driver acpi_battery_driver = {
}, },
}; };
struct acpi_battery_status { struct acpi_battery_state {
acpi_integer state; acpi_integer state;
acpi_integer present_rate; acpi_integer present_rate;
acpi_integer remaining_capacity; acpi_integer remaining_capacity;
@@ -183,8 +183,8 @@ acpi_battery_get_info(struct acpi_battery *battery,
} }
static int static int
acpi_battery_get_status(struct acpi_battery *battery, acpi_battery_get_state(struct acpi_battery *battery,
struct acpi_battery_status **bst) struct acpi_battery_state **bst)
{ {
int result = 0; int result = 0;
acpi_status status = 0; acpi_status status = 0;
@@ -425,7 +425,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
{ {
int result = 0; int result = 0;
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_battery_status *bst = NULL; struct acpi_battery_state *bst = NULL;
char *units = "?"; char *units = "?";
@@ -449,9 +449,9 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
/* Battery Status (_BST) */ /* Battery Status (_BST) */
result = acpi_battery_get_status(battery, &bst); result = acpi_battery_get_state(battery, &bst);
if (result || !bst) { if (result || !bst) {
seq_printf(seq, "ERROR: Unable to read battery status\n"); seq_printf(seq, "ERROR: Unable to read battery state\n");
goto end; goto end;
} }
@@ -621,7 +621,7 @@ static int acpi_battery_add_fs(struct acpi_device *device)
} }
/* 'status' [R] */ /* 'status' [R] */
entry = create_proc_entry(ACPI_BATTERY_FILE_STATUS, entry = create_proc_entry(ACPI_BATTERY_FILE_STATE,
S_IRUGO, acpi_device_dir(device)); S_IRUGO, acpi_device_dir(device));
if (!entry) if (!entry)
return -ENODEV; return -ENODEV;
@@ -652,7 +652,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device)
if (acpi_device_dir(device)) { if (acpi_device_dir(device)) {
remove_proc_entry(ACPI_BATTERY_FILE_ALARM, remove_proc_entry(ACPI_BATTERY_FILE_ALARM,
acpi_device_dir(device)); acpi_device_dir(device));
remove_proc_entry(ACPI_BATTERY_FILE_STATUS, remove_proc_entry(ACPI_BATTERY_FILE_STATE,
acpi_device_dir(device)); acpi_device_dir(device));
remove_proc_entry(ACPI_BATTERY_FILE_INFO, remove_proc_entry(ACPI_BATTERY_FILE_INFO,
acpi_device_dir(device)); acpi_device_dir(device));