Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 242578
b: refs/heads/master
c: a40402e
h: refs/heads/master
v: v3
  • Loading branch information
Lars-Peter Clausen committed Feb 22, 2011
1 parent f48c480 commit 47b0592
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 48 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3413b4ea250ff0b4142a154a2764e33979957e8b
refs/heads/master: a40402ef0bf3b6e53a7dfd396e9487eb2f613e19
86 changes: 39 additions & 47 deletions trunk/drivers/power/bq27x00_battery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ static DEFINE_MUTEX(battery_mutex);

struct bq27x00_device_info;
struct bq27x00_access_methods {
int (*read)(u8 reg, int *rt_value, int b_single,
struct bq27x00_device_info *di);
int (*read)(struct bq27x00_device_info *, u8 reg, int *rt_value,
bool single);
};

enum bq27x00_chip { BQ27000, BQ27500 };

struct bq27x00_device_info {
struct device *dev;
int id;
struct bq27x00_access_methods *bus;
struct power_supply bat;
enum bq27x00_chip chip;

struct i2c_client *client;
struct power_supply bat;

struct bq27x00_access_methods bus;
};

static enum power_supply_property bq27x00_battery_props[] = {
Expand All @@ -87,10 +87,10 @@ static enum power_supply_property bq27x00_battery_props[] = {
* Common code for BQ27x00 devices
*/

static int bq27x00_read(u8 reg, int *rt_value, int b_single,
struct bq27x00_device_info *di)
static inline int bq27x00_read(struct bq27x00_device_info *di, u8 reg,
int *rt_value, bool single)
{
return di->bus->read(reg, rt_value, b_single, di);
return di->bus.read(di, reg, rt_value, single);
}

/*
Expand All @@ -102,7 +102,7 @@ static int bq27x00_battery_temperature(struct bq27x00_device_info *di)
int ret;
int temp = 0;

ret = bq27x00_read(BQ27x00_REG_TEMP, &temp, 0, di);
ret = bq27x00_read(di, BQ27x00_REG_TEMP, &temp, false);
if (ret) {
dev_err(di->dev, "error reading temperature\n");
return ret;
Expand All @@ -123,7 +123,7 @@ static int bq27x00_battery_voltage(struct bq27x00_device_info *di)
int ret;
int volt = 0;

ret = bq27x00_read(BQ27x00_REG_VOLT, &volt, 0, di);
ret = bq27x00_read(di, BQ27x00_REG_VOLT, &volt, false);
if (ret) {
dev_err(di->dev, "error reading voltage\n");
return ret;
Expand All @@ -143,7 +143,7 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di)
int curr = 0;
int flags = 0;

ret = bq27x00_read(BQ27x00_REG_AI, &curr, 0, di);
ret = bq27x00_read(di, BQ27x00_REG_AI, &curr, false);
if (ret) {
dev_err(di->dev, "error reading current\n");
return 0;
Expand All @@ -153,7 +153,7 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di)
/* bq27500 returns signed value */
curr = (int)((s16)curr) * 1000;
} else {
ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di);
ret = bq27x00_read(di, BQ27x00_REG_FLAGS, &flags, false);
if (ret < 0) {
dev_err(di->dev, "error reading flags\n");
return 0;
Expand All @@ -178,9 +178,9 @@ static int bq27x00_battery_rsoc(struct bq27x00_device_info *di)
int rsoc = 0;

if (di->chip == BQ27500)
ret = bq27x00_read(BQ27500_REG_SOC, &rsoc, 0, di);
ret = bq27x00_read(di, BQ27500_REG_SOC, &rsoc, false);
else
ret = bq27x00_read(BQ27000_REG_RSOC, &rsoc, 1, di);
ret = bq27x00_read(di, BQ27000_REG_RSOC, &rsoc, true);
if (ret) {
dev_err(di->dev, "error reading relative State-of-Charge\n");
return ret;
Expand All @@ -196,7 +196,7 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,
int status;
int ret;

ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di);
ret = bq27x00_read(di, BQ27x00_REG_FLAGS, &flags, false);
if (ret < 0) {
dev_err(di->dev, "error reading flags\n");
return ret;
Expand Down Expand Up @@ -230,7 +230,7 @@ static int bq27x00_battery_time(struct bq27x00_device_info *di, int reg,
int tval = 0;
int ret;

ret = bq27x00_read(reg, &tval, 0, di);
ret = bq27x00_read(di, reg, &tval, false);
if (ret) {
dev_err(di->dev, "error reading register %02x\n", reg);
return ret;
Expand Down Expand Up @@ -296,23 +296,35 @@ static int bq27x00_battery_get_property(struct power_supply *psy,
return ret;
}

static void bq27x00_powersupply_init(struct bq27x00_device_info *di)
static int bq27x00_powersupply_init(struct bq27x00_device_info *di)
{
int ret;

di->bat.type = POWER_SUPPLY_TYPE_BATTERY;
di->bat.properties = bq27x00_battery_props;
di->bat.num_properties = ARRAY_SIZE(bq27x00_battery_props);
di->bat.get_property = bq27x00_battery_get_property;
di->bat.external_power_changed = NULL;

ret = power_supply_register(di->dev, &di->bat);
if (ret) {
dev_err(di->dev, "failed to register battery: %d\n", ret);
return ret;
}

dev_info(di->dev, "support ver. %s enabled\n", DRIVER_VERSION);

return 0;
}

/*
* i2c specific code
*/

static int bq27x00_read_i2c(u8 reg, int *rt_value, int b_single,
struct bq27x00_device_info *di)
static int bq27x00_read_i2c(struct bq27x00_device_info *di, u8 reg,
int *rt_value, bool single)
{
struct i2c_client *client = di->client;
struct i2c_client *client = to_i2c_client(di->dev);
struct i2c_msg msg[1];
unsigned char data[2];
int err;
Expand All @@ -329,15 +341,15 @@ static int bq27x00_read_i2c(u8 reg, int *rt_value, int b_single,
err = i2c_transfer(client->adapter, msg, 1);

if (err >= 0) {
if (!b_single)
if (!single)
msg->len = 2;
else
msg->len = 1;

msg->flags = I2C_M_RD;
err = i2c_transfer(client->adapter, msg, 1);
if (err >= 0) {
if (!b_single)
if (!single)
*rt_value = get_unaligned_le16(data);
else
*rt_value = data[0];
Expand All @@ -353,7 +365,6 @@ static int bq27x00_battery_probe(struct i2c_client *client,
{
char *name;
struct bq27x00_device_info *di;
struct bq27x00_access_methods *bus;
int num;
int retval = 0;

Expand All @@ -380,38 +391,20 @@ static int bq27x00_battery_probe(struct i2c_client *client,
retval = -ENOMEM;
goto batt_failed_2;
}

di->id = num;
di->dev = &client->dev;
di->chip = id->driver_data;
di->bat.name = name;
di->bus.read = &bq27x00_read_i2c;

bus = kzalloc(sizeof(*bus), GFP_KERNEL);
if (!bus) {
dev_err(&client->dev, "failed to allocate access method "
"data\n");
retval = -ENOMEM;
if (bq27x00_powersupply_init(di))
goto batt_failed_3;
}

i2c_set_clientdata(client, di);
di->dev = &client->dev;
di->bat.name = name;
bus->read = &bq27x00_read_i2c;
di->bus = bus;
di->client = client;

bq27x00_powersupply_init(di);

retval = power_supply_register(&client->dev, &di->bat);
if (retval) {
dev_err(&client->dev, "failed to register battery\n");
goto batt_failed_4;
}

dev_info(&client->dev, "support ver. %s enabled\n", DRIVER_VERSION);

return 0;

batt_failed_4:
kfree(bus);
batt_failed_3:
kfree(di);
batt_failed_2:
Expand All @@ -430,7 +423,6 @@ static int bq27x00_battery_remove(struct i2c_client *client)

power_supply_unregister(&di->bat);

kfree(di->bus);
kfree(di->bat.name);

mutex_lock(&battery_mutex);
Expand Down

0 comments on commit 47b0592

Please sign in to comment.