mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-23 16:53:58 -05:00
Code Activity

power: bq27xxx_battery: Restore device name

Browse source 
Patch <703df6c09795> ("power: bq27xxx_battery: Reorganize I2C
into a module") has removed the device name numbering from
bq27xxx_battery_i2c_probe. Fix that by restoring the code.

Fixes: 703df6c097
Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Ivaylo Dimitrov 2016-02-02 14:47:37 +02:00 • committed by Sebastian Reichel
parent e35a49b163
commit 9aafabc7fe
2 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/power/bq27xxx_battery_i2c.c
View file

@ -21,6 +21,9 @@
#include <linux/power/bq27xxx_battery.h> #include <linux/power/bq27xxx_battery.h>
static DEFINE_IDR(battery_id);
static DEFINE_MUTEX(battery_mutex);
static irqreturn_t bq27xxx_battery_irq_handler_thread(int irq, void *data) static irqreturn_t bq27xxx_battery_irq_handler_thread(int irq, void *data)
{ {
struct bq27xxx_device_info *di = data; struct bq27xxx_device_info *di = data;
@ -70,19 +73,33 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client,
{ {
struct bq27xxx_device_info *di; struct bq27xxx_device_info *di;
int ret; int ret;
char *name;
int num;
/* Get new ID for the new battery device */
mutex_lock(&battery_mutex);
num = idr_alloc(&battery_id, client, 0, 0, GFP_KERNEL);
mutex_unlock(&battery_mutex);
if (num < 0)
return num;
name = devm_kasprintf(&client->dev, GFP_KERNEL, "%s-%d", id->name, num);
if (!name)
goto err_mem;
di = devm_kzalloc(&client->dev, sizeof(*di), GFP_KERNEL); di = devm_kzalloc(&client->dev, sizeof(*di), GFP_KERNEL);
if (!di) if (!di)
return -ENOMEM; goto err_mem;
di->id = num;
di->dev = &client->dev; di->dev = &client->dev;
di->chip = id->driver_data; di->chip = id->driver_data;
di->name = id->name; di->name = name;
di->bus.read = bq27xxx_battery_i2c_read; di->bus.read = bq27xxx_battery_i2c_read;
ret = bq27xxx_battery_setup(di); ret = bq27xxx_battery_setup(di);
if (ret) if (ret)
return ret; goto err_failed;
/* Schedule a polling after about 1 min */ /* Schedule a polling after about 1 min */
schedule_delayed_work(&di->work, 60 * HZ); schedule_delayed_work(&di->work, 60 * HZ);
@ -103,6 +120,16 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client,
} }
return 0; return 0;
err_mem:
ret = -ENOMEM;
err_failed:
mutex_lock(&battery_mutex);
idr_remove(&battery_id, num);
mutex_unlock(&battery_mutex);
return ret;
} }
static int bq27xxx_battery_i2c_remove(struct i2c_client *client) static int bq27xxx_battery_i2c_remove(struct i2c_client *client)
@ -111,6 +138,10 @@ static int bq27xxx_battery_i2c_remove(struct i2c_client *client)
bq27xxx_battery_teardown(di); bq27xxx_battery_teardown(di);
mutex_lock(&battery_mutex);
idr_remove(&battery_id, di->id);
mutex_unlock(&battery_mutex);
return 0; return 0;
} }

1
include/linux/power/bq27xxx_battery.h
View file

@ -49,6 +49,7 @@ struct bq27xxx_reg_cache {
struct bq27xxx_device_info { struct bq27xxx_device_info {
struct device *dev; struct device *dev;
int id;
enum bq27xxx_chip chip; enum bq27xxx_chip chip;
const char *name; const char *name;
struct bq27xxx_access_methods bus; struct bq27xxx_access_methods bus;