system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-22 03:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wm831x_backup: Support multiple instances

Browse source 
If there are multiple wm831x devices in the system we need to assign
different names to the power supply devices in order to ensure we can
create the sysfs entries for them.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
This commit is contained in:
Mark Brown 2011-05-31 13:30:10 +01:00 committed by Anton Vorontsov
parent c84cad3d0f
commit d03760318e
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/power/wm831x_backup.c
View file

@ -22,6 +22,7 @@
struct wm831x_backup { struct wm831x_backup {
struct wm831x *wm831x; struct wm831x *wm831x;
struct power_supply backup; struct power_supply backup;
char name[20];
}; };
static int wm831x_backup_read_voltage(struct wm831x *wm831x, static int wm831x_backup_read_voltage(struct wm831x *wm831x,
@ -163,6 +164,7 @@ static enum power_supply_property wm831x_backup_props[] = {
static __devinit int wm831x_backup_probe(struct platform_device *pdev) static __devinit int wm831x_backup_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data;
struct wm831x_backup *devdata; struct wm831x_backup *devdata;
struct power_supply *backup; struct power_supply *backup;
int ret; int ret;
@ -182,7 +184,14 @@ static __devinit int wm831x_backup_probe(struct platform_device *pdev)
*/ */
wm831x_config_backup(wm831x); wm831x_config_backup(wm831x);
backup->name = "wm831x-backup"; if (wm831x_pdata && wm831x_pdata->wm831x_num)
snprintf(devdata->name, sizeof(devdata->name),
"wm831x-backup.%d", wm831x_pdata->wm831x_num);
else
snprintf(devdata->name, sizeof(devdata->name),
"wm831x-backup");
backup->name = devdata->name;
backup->type = POWER_SUPPLY_TYPE_BATTERY; backup->type = POWER_SUPPLY_TYPE_BATTERY;
backup->properties = wm831x_backup_props; backup->properties = wm831x_backup_props;
backup->num_properties = ARRAY_SIZE(wm831x_backup_props); backup->num_properties = ARRAY_SIZE(wm831x_backup_props);
@ -203,6 +212,7 @@ static __devexit int wm831x_backup_remove(struct platform_device *pdev)
struct wm831x_backup *devdata = platform_get_drvdata(pdev); struct wm831x_backup *devdata = platform_get_drvdata(pdev);
power_supply_unregister(&devdata->backup); power_supply_unregister(&devdata->backup);
kfree(devdata->backup.name);
kfree(devdata); kfree(devdata);
return 0; return 0;