Skip to content

L
linux-davinci
Commit 72206233 authored by Vladimir Lebedev's avatar Vladimir Lebedev Committed by Len Brown
Browse files
Options

ACPI: sbs: Common interface with CM battery 

The SBS driver has tne features as CM battery:
SBS update_time variable has tne same definition as CM battery 'update_time' variable.
Signed-off-by: default avatarVladimir Lebedev <vladimir.p.lebedev@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 6845118b
Show whitespace changes
Inline Side-by-side
Showing with 319 additions and 258 deletions
drivers/acpi/sbs.c
View file @ 72206233
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/jiffies.h>
#include <linux/delay.h> #include <linux/delay.h>
#define ACPI_SBS_COMPONENT 0x00080000 #define ACPI_SBS_COMPONENT 0x00080000
...@@ -109,29 +110,19 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); ...@@ -109,29 +110,19 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
#define ACPI_SBS_WORD_DATA 1 #define ACPI_SBS_WORD_DATA 1
#define ACPI_SBS_BLOCK_DATA 2 #define ACPI_SBS_BLOCK_DATA 2
static struct semaphore sbs_sem; #define UPDATE_DELAY 10
#define UPDATE_MODE QUEUE_UPDATE_MODE /* 0 - every time, > 0 - by update_time */
/* REQUEST_UPDATE_MODE QUEUE_UPDATE_MODE */ static unsigned int update_time = 120;
#define UPDATE_INFO_MODE 0
#define UPDATE_TIME 60
#define UPDATE_TIME2 0
static int capacity_mode = CAPACITY_UNIT; static unsigned int capacity_mode = CAPACITY_UNIT;
static int update_mode = UPDATE_MODE;
static int update_info_mode = UPDATE_INFO_MODE;
static int update_time = UPDATE_TIME;
static int update_time2 = UPDATE_TIME2;
module_param(capacity_mode, int, 0); module_param(update_time, uint, 0644);
module_param(update_mode, int, 0); module_param(capacity_mode, uint, 0444);
module_param(update_info_mode, int, 0);
module_param(update_time, int, 0);
module_param(update_time2, int, 0);
static int acpi_sbs_add(struct acpi_device *device); static int acpi_sbs_add(struct acpi_device *device);
static int acpi_sbs_remove(struct acpi_device *device, int type); static int acpi_sbs_remove(struct acpi_device *device, int type);
static void acpi_sbs_update_queue(void *data); static int acpi_sbs_resume(struct acpi_device *device);
static struct acpi_driver acpi_sbs_driver = { static struct acpi_driver acpi_sbs_driver = {
.name = "sbs", .name = "sbs",
...@@ -140,9 +131,14 @@ static struct acpi_driver acpi_sbs_driver = { ...@@ -140,9 +131,14 @@ static struct acpi_driver acpi_sbs_driver = {
.ops = { .ops = {
.add = acpi_sbs_add, .add = acpi_sbs_add,
.remove = acpi_sbs_remove, .remove = acpi_sbs_remove,
.resume = acpi_sbs_resume,
}, },
}; };
struct acpi_ac {
int ac_present;
};
struct acpi_battery_info { struct acpi_battery_info {
int capacity_mode; int capacity_mode;
s16 full_charge_capacity; s16 full_charge_capacity;
...@@ -160,9 +156,7 @@ struct acpi_battery_state { ...@@ -160,9 +156,7 @@ struct acpi_battery_state {
s16 voltage; s16 voltage;
s16 amperage; s16 amperage;
s16 remaining_capacity; s16 remaining_capacity;
s16 average_time_to_empty; s16 battery_state;
s16 average_time_to_full;
s16 battery_status;
}; };
struct acpi_battery_alarm { struct acpi_battery_alarm {
...@@ -171,9 +165,9 @@ struct acpi_battery_alarm { ...@@ -171,9 +165,9 @@ struct acpi_battery_alarm {
struct acpi_battery { struct acpi_battery {
int alive; int alive;
int battery_present;
int id; int id;
int init_state; int init_state;
int battery_present;
struct acpi_sbs *sbs; struct acpi_sbs *sbs;
struct acpi_battery_info info; struct acpi_battery_info info;
struct acpi_battery_state state; struct acpi_battery_state state;
...@@ -185,18 +179,22 @@ struct acpi_sbs { ...@@ -185,18 +179,22 @@ struct acpi_sbs {
acpi_handle handle; acpi_handle handle;
int base; int base;
struct acpi_device *device; struct acpi_device *device;
struct acpi_ec_smbus *smbus;
struct mutex mutex;
int sbsm_present; int sbsm_present;
int sbsm_batteries_supported; int sbsm_batteries_supported;
int ac_present;
struct proc_dir_entry *ac_entry; struct proc_dir_entry *ac_entry;
struct acpi_ac ac;
struct acpi_battery battery[MAX_SBS_BAT]; struct acpi_battery battery[MAX_SBS_BAT];
int update_info_mode;
int zombie; int zombie;
int update_time;
int update_time2;
struct timer_list update_timer; struct timer_list update_timer;
int run_cnt;
int update_proc_flg;
}; };
static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type);
static void acpi_sbs_update_time(void *data);
union sbs_rw_data { union sbs_rw_data {
u16 word; u16 word;
u8 block[ACPI_SBS_BLOCK_MAX + 2]; u8 block[ACPI_SBS_BLOCK_MAX + 2];
...@@ -205,8 +203,6 @@ union sbs_rw_data { ...@@ -205,8 +203,6 @@ union sbs_rw_data {
static int acpi_ec_sbs_access(struct acpi_sbs *sbs, u16 addr, static int acpi_ec_sbs_access(struct acpi_sbs *sbs, u16 addr,
char read_write, u8 command, int size, char read_write, u8 command, int size,
union sbs_rw_data *data); union sbs_rw_data *data);
static void acpi_update_delay(struct acpi_sbs *sbs);
static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
SMBus Communication SMBus Communication
...@@ -383,11 +379,49 @@ acpi_sbs_write_word(struct acpi_sbs *sbs, int addr, int func, int word) ...@@ -383,11 +379,49 @@ acpi_sbs_write_word(struct acpi_sbs *sbs, int addr, int func, int word)
return result; return result;
} }
static int sbs_zombie(struct acpi_sbs *sbs)
{
return (sbs->zombie);
}
static int sbs_mutex_lock(struct acpi_sbs *sbs)
{
if (sbs_zombie(sbs)) {
return -ENODEV;
}
mutex_lock(&sbs->mutex);
return 0;
}
static void sbs_mutex_unlock(struct acpi_sbs *sbs)
{
mutex_unlock(&sbs->mutex);
}
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Smart Battery System Management Smart Battery System Management
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
/* Smart Battery */ static int acpi_check_update_proc(struct acpi_sbs *sbs)
{
acpi_status status = AE_OK;
if (update_time == 0) {
sbs->update_proc_flg = 0;
return 0;
}
if (sbs->update_proc_flg == 0) {
status = acpi_os_execute(OSL_GPE_HANDLER,
acpi_sbs_update_time, sbs);
if (status != AE_OK) {
ACPI_EXCEPTION((AE_INFO, status,
"acpi_os_execute() failed"));
return 1;
}
sbs->update_proc_flg = 1;
}
return 0;
}
static int acpi_sbs_generate_event(struct acpi_device *device, static int acpi_sbs_generate_event(struct acpi_device *device,
int event, int state, char *bid, char *class) int event, int state, char *bid, char *class)
...@@ -430,16 +464,6 @@ static int acpi_battery_get_present(struct acpi_battery *battery) ...@@ -430,16 +464,6 @@ static int acpi_battery_get_present(struct acpi_battery *battery)
return result; return result;
} }
static int acpi_battery_is_present(struct acpi_battery *battery)
{
return (battery->battery_present);
}
static int acpi_ac_is_present(struct acpi_sbs *sbs)
{
return (sbs->ac_present);
}
static int acpi_battery_select(struct acpi_battery *battery) static int acpi_battery_select(struct acpi_battery *battery)
{ {
struct acpi_sbs *sbs = battery->sbs; struct acpi_sbs *sbs = battery->sbs;
...@@ -447,7 +471,7 @@ static int acpi_battery_select(struct acpi_battery *battery) ...@@ -447,7 +471,7 @@ static int acpi_battery_select(struct acpi_battery *battery)
s16 state; s16 state;
int foo; int foo;
if (battery->sbs->sbsm_present) { if (sbs->sbsm_present) {
/* Take special care not to knobble other nibbles of /* Take special care not to knobble other nibbles of
* state (aka selector_state), since * state (aka selector_state), since
...@@ -523,6 +547,8 @@ static int acpi_battery_get_info(struct acpi_battery *battery) ...@@ -523,6 +547,8 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
&battery->info.design_capacity); &battery->info.design_capacity);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_word() failed"));
goto end; goto end;
} }
...@@ -573,6 +599,8 @@ static int acpi_battery_get_info(struct acpi_battery *battery) ...@@ -573,6 +599,8 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x1c, result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x1c,
&battery->info.serial_number); &battery->info.serial_number);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_word() failed"));
goto end; goto end;
} }
...@@ -604,22 +632,11 @@ static int acpi_battery_get_info(struct acpi_battery *battery) ...@@ -604,22 +632,11 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
return result; return result;
} }
static void acpi_update_delay(struct acpi_sbs *sbs)
{
if (sbs->zombie) {
return;
}
if (sbs->update_time2 > 0) {
msleep(sbs->update_time2 * 1000);
}
}
static int acpi_battery_get_state(struct acpi_battery *battery) static int acpi_battery_get_state(struct acpi_battery *battery)
{ {
struct acpi_sbs *sbs = battery->sbs; struct acpi_sbs *sbs = battery->sbs;
int result = 0; int result = 0;
acpi_update_delay(battery->sbs);
result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x09, result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x09,
&battery->state.voltage); &battery->state.voltage);
if (result) { if (result) {
...@@ -628,7 +645,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery) ...@@ -628,7 +645,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
goto end; goto end;
} }
acpi_update_delay(battery->sbs);
result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x0a, result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x0a,
&battery->state.amperage); &battery->state.amperage);
if (result) { if (result) {
...@@ -637,7 +653,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery) ...@@ -637,7 +653,6 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
goto end; goto end;
} }
acpi_update_delay(battery->sbs);
result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x0f, result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x0f,
&battery->state.remaining_capacity); &battery->state.remaining_capacity);
if (result) { if (result) {
...@@ -646,35 +661,14 @@ static int acpi_battery_get_state(struct acpi_battery *battery) ...@@ -646,35 +661,14 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
goto end; goto end;
} }
acpi_update_delay(battery->sbs);
result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x12,
&battery->state.average_time_to_empty);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_word() failed"));
goto end;
}
acpi_update_delay(battery->sbs);
result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x13,
&battery->state.average_time_to_full);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_word() failed"));
goto end;
}
acpi_update_delay(battery->sbs);
result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x16, result = acpi_sbs_read_word(sbs, ACPI_SB_SMBUS_ADDR, 0x16,
&battery->state.battery_status); &battery->state.battery_state);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_read_word() failed")); "acpi_sbs_read_word() failed"));
goto end; goto end;
} }
acpi_update_delay(battery->sbs);
end: end:
return result; return result;
} }
...@@ -692,8 +686,6 @@ static int acpi_battery_get_alarm(struct acpi_battery *battery) ...@@ -692,8 +686,6 @@ static int acpi_battery_get_alarm(struct acpi_battery *battery)
goto end; goto end;
} }
acpi_update_delay(battery->sbs);
end: end:
return result; return result;
...@@ -751,6 +743,7 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery, ...@@ -751,6 +743,7 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery,
static int acpi_battery_set_mode(struct acpi_battery *battery) static int acpi_battery_set_mode(struct acpi_battery *battery)
{ {
struct acpi_sbs *sbs = battery->sbs;
int result = 0; int result = 0;
s16 battery_mode; s16 battery_mode;
...@@ -758,7 +751,7 @@ static int acpi_battery_set_mode(struct acpi_battery *battery) ...@@ -758,7 +751,7 @@ static int acpi_battery_set_mode(struct acpi_battery *battery)
goto end; goto end;
} }
result = acpi_sbs_read_word(battery->sbs, result = acpi_sbs_read_word(sbs,
ACPI_SB_SMBUS_ADDR, 0x03, &battery_mode); ACPI_SB_SMBUS_ADDR, 0x03, &battery_mode);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
...@@ -771,7 +764,7 @@ static int acpi_battery_set_mode(struct acpi_battery *battery) ...@@ -771,7 +764,7 @@ static int acpi_battery_set_mode(struct acpi_battery *battery)
} else { } else {
battery_mode |= 0x8000; battery_mode |= 0x8000;
} }
result = acpi_sbs_write_word(battery->sbs, result = acpi_sbs_write_word(sbs,
ACPI_SB_SMBUS_ADDR, 0x03, battery_mode); ACPI_SB_SMBUS_ADDR, 0x03, battery_mode);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
...@@ -779,7 +772,7 @@ static int acpi_battery_set_mode(struct acpi_battery *battery) ...@@ -779,7 +772,7 @@ static int acpi_battery_set_mode(struct acpi_battery *battery)
goto end; goto end;
} }
result = acpi_sbs_read_word(battery->sbs, result = acpi_sbs_read_word(sbs,
ACPI_SB_SMBUS_ADDR, 0x03, &battery_mode); ACPI_SB_SMBUS_ADDR, 0x03, &battery_mode);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
...@@ -798,7 +791,7 @@ static int acpi_battery_init(struct acpi_battery *battery) ...@@ -798,7 +791,7 @@ static int acpi_battery_init(struct acpi_battery *battery)
result = acpi_battery_select(battery); result = acpi_battery_select(battery);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_init() failed")); "acpi_battery_select() failed"));
goto end; goto end;
} }
...@@ -848,7 +841,7 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs) ...@@ -848,7 +841,7 @@ static int acpi_ac_get_present(struct acpi_sbs *sbs)
goto end; goto end;
} }
sbs->ac_present = (charger_status & 0x8000) >> 15; sbs->ac.ac_present = (charger_status & 0x8000) >> 15;
end: end:
...@@ -945,24 +938,27 @@ static struct proc_dir_entry *acpi_battery_dir = NULL; ...@@ -945,24 +938,27 @@ static struct proc_dir_entry *acpi_battery_dir = NULL;
static int acpi_battery_read_info(struct seq_file *seq, void *offset) static int acpi_battery_read_info(struct seq_file *seq, void *offset)
{ {
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs;
int cscale; int cscale;
int result = 0; int result = 0;
if (battery->sbs->zombie) { if (sbs_mutex_lock(sbs)) {
return -ENODEV; return -ENODEV;
} }
down(&sbs_sem); result = acpi_check_update_proc(sbs);
if (result)
goto end;
if (update_mode == REQUEST_UPDATE_MODE) { if (update_time == 0) {
result = acpi_sbs_update_run(battery->sbs, DATA_TYPE_INFO); result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_INFO);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed")); "acpi_sbs_update_run() failed"));
} }
} }
if (acpi_battery_is_present(battery)) { if (battery->battery_present) {
seq_printf(seq, "present: yes\n"); seq_printf(seq, "present: yes\n");
} else { } else {
seq_printf(seq, "present: no\n"); seq_printf(seq, "present: no\n");
...@@ -974,13 +970,13 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset) ...@@ -974,13 +970,13 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
} else { } else {
cscale = battery->info.ipscale; cscale = battery->info.ipscale;
} }
seq_printf(seq, "design capacity: %i%s", seq_printf(seq, "design capacity: %i%s\n",
battery->info.design_capacity * cscale, battery->info.design_capacity * cscale,
battery->info.capacity_mode ? "0 mWh\n" : " mAh\n"); battery->info.capacity_mode ? "0 mWh" : " mAh");
seq_printf(seq, "last full capacity: %i%s", seq_printf(seq, "last full capacity: %i%s\n",
battery->info.full_charge_capacity * cscale, battery->info.full_charge_capacity * cscale,
battery->info.capacity_mode ? "0 mWh\n" : " mAh\n"); battery->info.capacity_mode ? "0 mWh" : " mAh");
seq_printf(seq, "battery technology: rechargeable\n"); seq_printf(seq, "battery technology: rechargeable\n");
...@@ -1006,7 +1002,7 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset) ...@@ -1006,7 +1002,7 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
end: end:
up(&sbs_sem); sbs_mutex_unlock(sbs);
return result; return result;
} }
...@@ -1018,26 +1014,29 @@ static int acpi_battery_info_open_fs(struct inode *inode, struct file *file) ...@@ -1018,26 +1014,29 @@ 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) static int acpi_battery_read_state(struct seq_file *seq, void *offset)
{ {
struct acpi_battery *battery = (struct acpi_battery *)seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs;
int result = 0; int result = 0;
int cscale; int cscale;
int foo; int foo;
if (battery->sbs->zombie) { if (sbs_mutex_lock(sbs)) {
return -ENODEV; return -ENODEV;
} }
down(&sbs_sem); result = acpi_check_update_proc(sbs);
if (result)
goto end;
if (update_mode == REQUEST_UPDATE_MODE) { if (update_time == 0) {
result = acpi_sbs_update_run(battery->sbs, DATA_TYPE_STATE); result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_STATE);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed")); "acpi_sbs_update_run() failed"));
} }
} }
if (acpi_battery_is_present(battery)) { if (battery->battery_present) {
seq_printf(seq, "present: yes\n"); seq_printf(seq, "present: yes\n");
} else { } else {
seq_printf(seq, "present: no\n"); seq_printf(seq, "present: no\n");
...@@ -1050,7 +1049,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset) ...@@ -1050,7 +1049,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
cscale = battery->info.ipscale; cscale = battery->info.ipscale;
} }
if (battery->state.battery_status & 0x0010) { if (battery->state.battery_state & 0x0010) {
seq_printf(seq, "capacity state: critical\n"); seq_printf(seq, "capacity state: critical\n");
} else { } else {
seq_printf(seq, "capacity state: ok\n"); seq_printf(seq, "capacity state: ok\n");
...@@ -1074,16 +1073,16 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset) ...@@ -1074,16 +1073,16 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
battery->info.capacity_mode ? "mW" : "mA"); battery->info.capacity_mode ? "mW" : "mA");
} }
seq_printf(seq, "remaining capacity: %i%s", seq_printf(seq, "remaining capacity: %i%s\n",
battery->state.remaining_capacity * cscale, battery->state.remaining_capacity * cscale,
battery->info.capacity_mode ? "0 mWh\n" : " mAh\n"); battery->info.capacity_mode ? "0 mWh" : " mAh");
seq_printf(seq, "present voltage: %i mV\n", seq_printf(seq, "present voltage: %i mV\n",
battery->state.voltage * battery->info.vscale); battery->state.voltage * battery->info.vscale);
end: end:
up(&sbs_sem); sbs_mutex_unlock(sbs);
return result; return result;
} }
...@@ -1096,24 +1095,27 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file) ...@@ -1096,24 +1095,27 @@ 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) static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
{ {
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs;
int result = 0; int result = 0;
int cscale; int cscale;
if (battery->sbs->zombie) { if (sbs_mutex_lock(sbs)) {
return -ENODEV; return -ENODEV;
} }
down(&sbs_sem); result = acpi_check_update_proc(sbs);
if (result)
goto end;
if (update_mode == REQUEST_UPDATE_MODE) { if (update_time == 0) {
result = acpi_sbs_update_run(battery->sbs, DATA_TYPE_ALARM); result = acpi_sbs_update_run(sbs, battery->id, DATA_TYPE_ALARM);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed")); "acpi_sbs_update_run() failed"));
} }
} }
if (!acpi_battery_is_present(battery)) { if (!battery->battery_present) {
seq_printf(seq, "present: no\n"); seq_printf(seq, "present: no\n");
goto end; goto end;
} }
...@@ -1126,16 +1128,16 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset) ...@@ -1126,16 +1128,16 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
seq_printf(seq, "alarm: "); seq_printf(seq, "alarm: ");
if (battery->alarm.remaining_capacity) { if (battery->alarm.remaining_capacity) {
seq_printf(seq, "%i%s", seq_printf(seq, "%i%s\n",
battery->alarm.remaining_capacity * cscale, battery->alarm.remaining_capacity * cscale,
battery->info.capacity_mode ? "0 mWh\n" : " mAh\n"); battery->info.capacity_mode ? "0 mWh" : " mAh");
} else { } else {
seq_printf(seq, "disabled\n"); seq_printf(seq, "disabled\n");
} }
end: end:
up(&sbs_sem); sbs_mutex_unlock(sbs);
return result; return result;
} }
...@@ -1146,16 +1148,19 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer, ...@@ -1146,16 +1148,19 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer,
{ {
struct seq_file *seq = file->private_data; struct seq_file *seq = file->private_data;
struct acpi_battery *battery = seq->private; struct acpi_battery *battery = seq->private;
struct acpi_sbs *sbs = battery->sbs;
char alarm_string[12] = { '\0' }; char alarm_string[12] = { '\0' };
int result, old_alarm, new_alarm; int result, old_alarm, new_alarm;
if (battery->sbs->zombie) { if (sbs_mutex_lock(sbs)) {
return -ENODEV; return -ENODEV;
} }
down(&sbs_sem); result = acpi_check_update_proc(sbs);
if (result)
goto end;
if (!acpi_battery_is_present(battery)) { if (!battery->battery_present) {
result = -ENODEV; result = -ENODEV;
goto end; goto end;
} }
...@@ -1191,7 +1196,7 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer, ...@@ -1191,7 +1196,7 @@ acpi_battery_write_alarm(struct file *file, const char __user * buffer,
} }
end: end:
up(&sbs_sem); sbs_mutex_unlock(sbs);
if (result) { if (result) {
return result; return result;
...@@ -1239,14 +1244,12 @@ static int acpi_ac_read_state(struct seq_file *seq, void *offset) ...@@ -1239,14 +1244,12 @@ static int acpi_ac_read_state(struct seq_file *seq, void *offset)
struct acpi_sbs *sbs = seq->private; struct acpi_sbs *sbs = seq->private;
int result; int result;
if (sbs->zombie) { if (sbs_mutex_lock(sbs)) {
return -ENODEV; return -ENODEV;
} }
down(&sbs_sem); if (update_time == 0) {
result = acpi_sbs_update_run(sbs, -1, DATA_TYPE_AC_STATE);
if (update_mode == REQUEST_UPDATE_MODE) {
result = acpi_sbs_update_run(sbs, DATA_TYPE_AC_STATE);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed")); "acpi_sbs_update_run() failed"));
...@@ -1254,9 +1257,9 @@ static int acpi_ac_read_state(struct seq_file *seq, void *offset) ...@@ -1254,9 +1257,9 @@ static int acpi_ac_read_state(struct seq_file *seq, void *offset)
} }
seq_printf(seq, "state: %s\n", seq_printf(seq, "state: %s\n",
sbs->ac_present ? "on-line" : "off-line"); sbs->ac.ac_present ? "on-line" : "off-line");
up(&sbs_sem); sbs_mutex_unlock(sbs);
return 0; return 0;
} }
...@@ -1309,7 +1312,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) ...@@ -1309,7 +1312,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
goto end; goto end;
} }
is_present = acpi_battery_is_present(battery); is_present = battery->battery_present;
if (is_present) { if (is_present) {
result = acpi_battery_init(battery); result = acpi_battery_init(battery);
...@@ -1336,6 +1339,10 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) ...@@ -1336,6 +1339,10 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
} }
battery->alive = 1; battery->alive = 1;
printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",
ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), dir_name,
sbs->battery->battery_present ? "present" : "absent");
end: end:
return result; return result;
} }
...@@ -1370,6 +1377,10 @@ static int acpi_ac_add(struct acpi_sbs *sbs) ...@@ -1370,6 +1377,10 @@ static int acpi_ac_add(struct acpi_sbs *sbs)
goto end; goto end;
} }
printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n",
ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
ACPI_AC_DIR_NAME, sbs->ac.ac_present ? "on-line" : "off-line");
end: end:
return result; return result;
...@@ -1383,29 +1394,48 @@ static void acpi_ac_remove(struct acpi_sbs *sbs) ...@@ -1383,29 +1394,48 @@ static void acpi_ac_remove(struct acpi_sbs *sbs)
} }
} }
static void acpi_sbs_update_queue_run(unsigned long data) static void acpi_sbs_update_time_run(unsigned long data)
{ {
acpi_os_execute(OSL_GPE_HANDLER, acpi_sbs_update_queue, (void *)data); acpi_os_execute(OSL_GPE_HANDLER, acpi_sbs_update_time, (void *)data);
} }
static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type) static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type)
{ {
struct acpi_battery *battery; struct acpi_battery *battery;
int result = 0; int result = 0, cnt;
int old_ac_present; int old_ac_present = -1;
int old_battery_present; int old_battery_present = -1;
int new_ac_present; int new_ac_present = -1;
int new_battery_present; int new_battery_present = -1;
int id; int id_min = 0, id_max = MAX_SBS_BAT - 1;
char dir_name[32]; char dir_name[32];
int do_battery_init, do_ac_init; int do_battery_init = 0, do_ac_init = 0;
s16 old_remaining_capacity; int old_remaining_capacity = 0;
int update_ac = 1, update_battery = 1;
int up_tm = update_time;
if (sbs_zombie(sbs)) {
goto end;
}
if (id >= 0) {
id_min = id_max = id;
}
if (data_type == DATA_TYPE_COMMON && up_tm > 0) {
cnt = up_tm / (up_tm > UPDATE_DELAY ? UPDATE_DELAY : up_tm);
if (sbs->run_cnt % cnt != 0) {
update_battery = 0;
}
}
sbs->run_cnt++;
if (sbs->zombie) { if (!update_ac && !update_battery) {
goto end; goto end;
} }
old_ac_present = acpi_ac_is_present(sbs); old_ac_present = sbs->ac.ac_present;
result = acpi_ac_get_present(sbs); result = acpi_ac_get_present(sbs);
if (result) { if (result) {
...@@ -1413,15 +1443,36 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type) ...@@ -1413,15 +1443,36 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
"acpi_ac_get_present() failed")); "acpi_ac_get_present() failed"));
} }
new_ac_present = acpi_ac_is_present(sbs); new_ac_present = sbs->ac.ac_present;
do_ac_init = (old_ac_present != new_ac_present); do_ac_init = (old_ac_present != new_ac_present);
if (sbs->run_cnt == 1 && data_type == DATA_TYPE_COMMON) {
do_ac_init = 1;
}
if (data_type == DATA_TYPE_AC_STATE) { if (do_ac_init) {
result = acpi_sbs_generate_event(sbs->device,
ACPI_SBS_AC_NOTIFY_STATUS,
new_ac_present,
ACPI_AC_DIR_NAME,
ACPI_AC_CLASS);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_generate_event() failed"));
}
}
if (data_type == DATA_TYPE_COMMON) {
if (!do_ac_init && !update_battery) {
goto end; goto end;
} }
}
for (id = 0; id < MAX_SBS_BAT; id++) { if (data_type == DATA_TYPE_AC_STATE && !do_ac_init) {
goto end;
}
for (id = id_min; id <= id_max; id++) {
battery = &sbs->battery[id]; battery = &sbs->battery[id];
if (battery->alive == 0) { if (battery->alive == 0) {
continue; continue;
...@@ -1429,41 +1480,27 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type) ...@@ -1429,41 +1480,27 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
old_remaining_capacity = battery->state.remaining_capacity; old_remaining_capacity = battery->state.remaining_capacity;
old_battery_present = acpi_battery_is_present(battery); old_battery_present = battery->battery_present;
result = acpi_battery_select(battery); result = acpi_battery_select(battery);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_select() failed")); "acpi_battery_select() failed"));
} }
if (sbs->zombie) {
goto end;
}
result = acpi_battery_get_present(battery); result = acpi_battery_get_present(battery);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_present() failed")); "acpi_battery_get_present() failed"));
} }
if (sbs->zombie) {
goto end;
}
new_battery_present = acpi_battery_is_present(battery); new_battery_present = battery->battery_present;
do_battery_init = ((old_battery_present != new_battery_present) do_battery_init = ((old_battery_present != new_battery_present)
&& new_battery_present); && new_battery_present);
if (!new_battery_present)
if (sbs->zombie) { goto event;
goto end; if (do_ac_init || do_battery_init) {
}
if (do_ac_init || do_battery_init ||
update_info_mode || sbs->update_info_mode) {
if (sbs->update_info_mode) {
sbs->update_info_mode = 0;
} else {
sbs->update_info_mode = 1;
}
result = acpi_battery_init(battery); result = acpi_battery_init(battery);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
...@@ -1471,52 +1508,64 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type) ...@@ -1471,52 +1508,64 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
"failed")); "failed"));
} }
} }
if (data_type == DATA_TYPE_INFO) { if (sbs_zombie(sbs)) {
continue;
}
if (sbs->zombie) {
goto end; goto end;
} }
if (new_battery_present) {
result = acpi_battery_get_alarm(battery); if ((data_type == DATA_TYPE_COMMON
|| data_type == DATA_TYPE_INFO)
&& new_battery_present) {
result = acpi_battery_get_info(battery);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_alarm() " "acpi_battery_get_info() failed"));
"failed"));
} }
if (data_type == DATA_TYPE_ALARM) { }
if (data_type == DATA_TYPE_INFO) {
continue; continue;
} }
if (sbs_zombie(sbs)) {
goto end;
}
if ((data_type == DATA_TYPE_COMMON
|| data_type == DATA_TYPE_STATE)
&& new_battery_present) {
result = acpi_battery_get_state(battery); result = acpi_battery_get_state(battery);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_get_state() " "acpi_battery_get_state() failed"));
"failed"));
} }
} }
if (sbs->zombie) { if (data_type == DATA_TYPE_STATE) {
goto end; goto event;
} }
if (data_type != DATA_TYPE_COMMON) { if (sbs_zombie(sbs)) {
continue; goto end;
} }
if (old_battery_present != new_battery_present) { if ((data_type == DATA_TYPE_COMMON
sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id); || data_type == DATA_TYPE_ALARM)
result = acpi_sbs_generate_event(sbs->device, && new_battery_present) {
ACPI_SBS_BATTERY_NOTIFY_STATUS, result = acpi_battery_get_alarm(battery);
new_battery_present,
dir_name,
ACPI_BATTERY_CLASS);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_generate_event() " "acpi_battery_get_alarm() "
"failed")); "failed"));
} }
} }
if (old_remaining_capacity != battery->state.remaining_capacity) { if (data_type == DATA_TYPE_ALARM) {
continue;
}
if (sbs_zombie(sbs)) {
goto end;
}
event:
if (old_battery_present != new_battery_present || do_ac_init ||
old_remaining_capacity !=
battery->state.remaining_capacity) {
sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id); sprintf(dir_name, ACPI_BATTERY_DIR_NAME, id);
result = acpi_sbs_generate_event(sbs->device, result = acpi_sbs_generate_event(sbs->device,
ACPI_SBS_BATTERY_NOTIFY_STATUS, ACPI_SBS_BATTERY_NOTIFY_STATUS,
...@@ -1525,71 +1574,62 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type) ...@@ -1525,71 +1574,62 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int data_type)
ACPI_BATTERY_CLASS); ACPI_BATTERY_CLASS);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_generate_event() failed")); "acpi_sbs_generate_event() "
} "failed"));
}
} }
if (sbs->zombie) {
goto end;
}
if (data_type != DATA_TYPE_COMMON) {
goto end;
}
if (old_ac_present != new_ac_present) {
result = acpi_sbs_generate_event(sbs->device,
ACPI_SBS_AC_NOTIFY_STATUS,
new_ac_present,
ACPI_AC_DIR_NAME,
ACPI_AC_CLASS);
if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_generate_event() failed"));
} }
} }
end: end:
return result; return result;
} }
static void acpi_sbs_update_queue(void *data) static void acpi_sbs_update_time(void *data)
{ {
struct acpi_sbs *sbs = data; struct acpi_sbs *sbs = data;
unsigned long delay = -1; unsigned long delay = -1;
int result; int result;
unsigned int up_tm = update_time;
if (sbs->zombie) { if (sbs_mutex_lock(sbs))
goto end; return;
}
result = acpi_sbs_update_run(sbs, DATA_TYPE_COMMON); result = acpi_sbs_update_run(sbs, -1, DATA_TYPE_COMMON);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_update_run() failed")); "acpi_sbs_update_run() failed"));
} }
if (sbs->zombie) { if (sbs_zombie(sbs)) {
goto end;
}
if (update_mode == REQUEST_UPDATE_MODE) {
goto end; goto end;
} }
delay = jiffies + HZ * update_time; if (!up_tm) {
if (timer_pending(&sbs->update_timer))
del_timer(&sbs->update_timer);
} else {
delay = (up_tm > UPDATE_DELAY ? UPDATE_DELAY : up_tm);
delay = jiffies + HZ * delay;
if (timer_pending(&sbs->update_timer)) {
mod_timer(&sbs->update_timer, delay);
} else {
sbs->update_timer.data = (unsigned long)data; sbs->update_timer.data = (unsigned long)data;
sbs->update_timer.function = acpi_sbs_update_queue_run; sbs->update_timer.function = acpi_sbs_update_time_run;
sbs->update_timer.expires = delay; sbs->update_timer.expires = delay;
add_timer(&sbs->update_timer); add_timer(&sbs->update_timer);
}
}
end: end:
;
sbs_mutex_unlock(sbs);
} }
static int acpi_sbs_add(struct acpi_device *device) static int acpi_sbs_add(struct acpi_device *device)
{ {
struct acpi_sbs *sbs = NULL; struct acpi_sbs *sbs = NULL;
int result; int result = 0, remove_result = 0;
unsigned long sbs_obj; unsigned long sbs_obj;
int id; int id;
acpi_status status = AE_OK; acpi_status status = AE_OK;
...@@ -1604,33 +1644,34 @@ static int acpi_sbs_add(struct acpi_device *device) ...@@ -1604,33 +1644,34 @@ static int acpi_sbs_add(struct acpi_device *device)
sbs = kzalloc(sizeof(struct acpi_sbs), GFP_KERNEL); sbs = kzalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
if (!sbs) { if (!sbs) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, "kmalloc() failed")); ACPI_EXCEPTION((AE_INFO, AE_ERROR, "kzalloc() failed"));
return -ENOMEM; result = -ENOMEM;
goto end;
} }
sbs->base = (val & 0xff00ull) >> 8;
mutex_init(&sbs->mutex);
sbs_mutex_lock(sbs);
sbs->base = (val & 0xff00ull) >> 8;
sbs->device = device; sbs->device = device;
strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME); strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_SBS_CLASS); strcpy(acpi_device_class(device), ACPI_SBS_CLASS);
acpi_driver_data(device) = sbs; acpi_driver_data(device) = sbs;
sbs->update_time = 0;
sbs->update_time2 = 0;
result = acpi_ac_add(sbs); result = acpi_ac_add(sbs);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, "acpi_ac_add() failed")); ACPI_EXCEPTION((AE_INFO, AE_ERROR, "acpi_ac_add() failed"));
goto end; goto end;
} }
result = acpi_evaluate_integer(device->handle, "_SBS", NULL, &sbs_obj); status = acpi_evaluate_integer(device->handle, "_SBS", NULL, &sbs_obj);
if (ACPI_FAILURE(result)) { if (status) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, status,
"acpi_evaluate_integer() failed")); "acpi_evaluate_integer() failed"));
result = -EIO; result = -EIO;
goto end; goto end;
} }
if (sbs_obj > 0) { if (sbs_obj > 0) {
result = acpi_sbsm_get_info(sbs); result = acpi_sbsm_get_info(sbs);
if (result) { if (result) {
...@@ -1640,6 +1681,7 @@ static int acpi_sbs_add(struct acpi_device *device) ...@@ -1640,6 +1681,7 @@ static int acpi_sbs_add(struct acpi_device *device)
} }
sbs->sbsm_present = 1; sbs->sbsm_present = 1;
} }
if (sbs->sbsm_present == 0) { if (sbs->sbsm_present == 0) {
result = acpi_battery_add(sbs, 0); result = acpi_battery_add(sbs, 0);
if (result) { if (result) {
...@@ -1653,8 +1695,7 @@ static int acpi_sbs_add(struct acpi_device *device) ...@@ -1653,8 +1695,7 @@ static int acpi_sbs_add(struct acpi_device *device)
result = acpi_battery_add(sbs, id); result = acpi_battery_add(sbs, id);
if (result) { if (result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_battery_add() " "acpi_battery_add() failed"));
"failed"));
goto end; goto end;
} }
} }
...@@ -1664,29 +1705,26 @@ static int acpi_sbs_add(struct acpi_device *device) ...@@ -1664,29 +1705,26 @@ static int acpi_sbs_add(struct acpi_device *device)
sbs->handle = device->handle; sbs->handle = device->handle;
init_timer(&sbs->update_timer); init_timer(&sbs->update_timer);
if (update_mode == QUEUE_UPDATE_MODE) { result = acpi_check_update_proc(sbs);
status = acpi_os_execute(OSL_GPE_HANDLER, if (result)
acpi_sbs_update_queue, sbs); goto end;
if (status != AE_OK) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_os_execute() failed"));
}
}
sbs->update_time = update_time;
sbs->update_time2 = update_time2;
printk(KERN_INFO PREFIX "%s [%s]\n",
acpi_device_name(device), acpi_device_bid(device));
end: end:
sbs_mutex_unlock(sbs);
if (result) { if (result) {
acpi_sbs_remove(device, 0); remove_result = acpi_sbs_remove(device, 0);
if (remove_result) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_sbs_remove() failed"));
}
} }
return result; return result;
} }
int acpi_sbs_remove(struct acpi_device *device, int type) static int acpi_sbs_remove(struct acpi_device *device, int type)
{ {
struct acpi_sbs *sbs; struct acpi_sbs *sbs;
int id; int id;
...@@ -1695,15 +1733,14 @@ int acpi_sbs_remove(struct acpi_device *device, int type) ...@@ -1695,15 +1733,14 @@ int acpi_sbs_remove(struct acpi_device *device, int type)
return -EINVAL; return -EINVAL;
} }
sbs = (struct acpi_sbs *)acpi_driver_data(device); sbs = acpi_driver_data(device);
if (!sbs) { if (!sbs) {
return -EINVAL; return -EINVAL;
} }
sbs_mutex_lock(sbs);
sbs->zombie = 1; sbs->zombie = 1;
sbs->update_time = 0;
sbs->update_time2 = 0;
del_timer_sync(&sbs->update_timer); del_timer_sync(&sbs->update_timer);
acpi_os_wait_events_complete(NULL); acpi_os_wait_events_complete(NULL);
del_timer_sync(&sbs->update_timer); del_timer_sync(&sbs->update_timer);
...@@ -1714,13 +1751,41 @@ int acpi_sbs_remove(struct acpi_device *device, int type) ...@@ -1714,13 +1751,41 @@ int acpi_sbs_remove(struct acpi_device *device, int type)
acpi_ac_remove(sbs); acpi_ac_remove(sbs);
acpi_driver_data(device) = NULL; sbs_mutex_unlock(sbs);
mutex_destroy(&sbs->mutex);
kfree(sbs); kfree(sbs);
return 0; return 0;
} }
static void acpi_sbs_rmdirs(void)
{
if (acpi_ac_dir) {
acpi_unlock_ac_dir(acpi_ac_dir);
acpi_ac_dir = NULL;
}
if (acpi_battery_dir) {
acpi_unlock_battery_dir(acpi_battery_dir);
acpi_battery_dir = NULL;
}
}
static int acpi_sbs_resume(struct acpi_device *device)
{
struct acpi_sbs *sbs;
if (!device)
return -EINVAL;
sbs = device->driver_data;
sbs->run_cnt = 0;
return 0;
}
static int __init acpi_sbs_init(void) static int __init acpi_sbs_init(void)
{ {
int result = 0; int result = 0;
...@@ -1728,12 +1793,10 @@ static int __init acpi_sbs_init(void) ...@@ -1728,12 +1793,10 @@ static int __init acpi_sbs_init(void)
if (acpi_disabled) if (acpi_disabled)
return -ENODEV; return -ENODEV;
init_MUTEX(&sbs_sem);
if (capacity_mode != DEF_CAPACITY_UNIT if (capacity_mode != DEF_CAPACITY_UNIT
&& capacity_mode != MAH_CAPACITY_UNIT && capacity_mode != MAH_CAPACITY_UNIT
&& capacity_mode != MWH_CAPACITY_UNIT) { && capacity_mode != MWH_CAPACITY_UNIT) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, "acpi_sbs_init: " ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"invalid capacity_mode = %d", capacity_mode)); "invalid capacity_mode = %d", capacity_mode));
return -EINVAL; return -EINVAL;
} }
...@@ -1749,6 +1812,7 @@ static int __init acpi_sbs_init(void) ...@@ -1749,6 +1812,7 @@ static int __init acpi_sbs_init(void)
if (!acpi_battery_dir) { if (!acpi_battery_dir) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_lock_battery_dir() failed")); "acpi_lock_battery_dir() failed"));
acpi_sbs_rmdirs();
return -ENODEV; return -ENODEV;
} }
...@@ -1756,6 +1820,7 @@ static int __init acpi_sbs_init(void) ...@@ -1756,6 +1820,7 @@ static int __init acpi_sbs_init(void)
if (result < 0) { if (result < 0) {
ACPI_EXCEPTION((AE_INFO, AE_ERROR, ACPI_EXCEPTION((AE_INFO, AE_ERROR,
"acpi_bus_register_driver() failed")); "acpi_bus_register_driver() failed"));
acpi_sbs_rmdirs();
return -ENODEV; return -ENODEV;
} }
...@@ -1764,13 +1829,9 @@ static int __init acpi_sbs_init(void) ...@@ -1764,13 +1829,9 @@ static int __init acpi_sbs_init(void)
static void __exit acpi_sbs_exit(void) static void __exit acpi_sbs_exit(void)
{ {
acpi_bus_unregister_driver(&acpi_sbs_driver); acpi_bus_unregister_driver(&acpi_sbs_driver);
acpi_unlock_ac_dir(acpi_ac_dir); acpi_sbs_rmdirs();
acpi_ac_dir = NULL;
acpi_unlock_battery_dir(acpi_battery_dir);
acpi_battery_dir = NULL;
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment