a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: bq27xxx_battery: Platform initialization must declare a device

Browse Source 
When initialized as a platform device the initializer must now specify
a device. An empty device name is no longer valid.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Andrew F. Davis 2015-09-22 14:35:07 -05:00 committed by Sebastian Reichel
parent 081bab217d
commit 424cfde49a
3 changed files with 12 additions and 4 deletions
drivers
power
bq27xxx_battery.c
w1/slaves
w1_bq27000.c
include/linux/power
bq27xxx_battery.h

9
drivers/power/bq27xxx_battery.c
View File

@ -91,8 +91,6 @@ struct bq27xxx_access_methods {
int (*read)(struct bq27xxx_device_info *di, u8 reg, bool single); int (*read)(struct bq27xxx_device_info *di, u8 reg, bool single);
}; };
enum bq27xxx_chip { BQ27000, BQ27500, BQ27425, BQ27742, BQ27510};
struct bq27xxx_reg_cache { struct bq27xxx_reg_cache {
int temperature; int temperature;
int time_to_empty; int time_to_empty;
@ -1036,6 +1034,11 @@ static int bq27xxx_battery_platform_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
if (!pdata->chip) {
dev_err(&pdev->dev, "no device supplied\n");
return -EINVAL;
}
di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL); di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL);
if (!di) if (!di)
return -ENOMEM; return -ENOMEM;
@ -1043,7 +1046,7 @@ static int bq27xxx_battery_platform_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, di); platform_set_drvdata(pdev, di);
di->dev = &pdev->dev; di->dev = &pdev->dev;
di->chip = BQ27000; di->chip = pdata->chip;
name = pdata->name ?: dev_name(&pdev->dev); name = pdata->name ?: dev_name(&pdev->dev);
di->bus.read = &bq27xxx_battery_platform_read; di->bus.read = &bq27xxx_battery_platform_read;

1
drivers/w1/slaves/w1_bq27000.c
View File

@ -42,6 +42,7 @@ static int w1_bq27000_read(struct device *dev, unsigned int reg)
static struct bq27xxx_platform_data bq27000_battery_info = { static struct bq27xxx_platform_data bq27000_battery_info = {
.read = w1_bq27000_read, .read = w1_bq27000_read,
.name = "bq27000-battery", .name = "bq27000-battery",
.chip = BQ27000,
}; };
static int w1_bq27000_add_slave(struct w1_slave *sl) static int w1_bq27000_add_slave(struct w1_slave *sl)

6
include/linux/power/bq27xxx_battery.h
View File

@ -3,7 +3,8 @@
/** /**
* struct bq27xxx_plaform_data - Platform data for bq27xxx devices * struct bq27xxx_plaform_data - Platform data for bq27xxx devices
* @name: Name of the battery. If NULL the driver will fallback to "bq27000". * @name: Name of the battery.
* @chip: Chip class number of this device.
* @read: HDQ read callback. * @read: HDQ read callback.
* This function should provide access to the HDQ bus the battery is * This function should provide access to the HDQ bus the battery is
* connected to. * connected to.
@ -11,8 +12,11 @@
* register to be read. The return value should either be the content of * register to be read. The return value should either be the content of
* the passed register or an error value. * the passed register or an error value.
*/ */
enum bq27xxx_chip { BQ27000 = 1, BQ27500, BQ27425, BQ27742, BQ27510 };
struct bq27xxx_platform_data { struct bq27xxx_platform_data {
const char *name; const char *name;
enum bq27xxx_chip chip;
int (*read)(struct device *dev, unsigned int); int (*read)(struct device *dev, unsigned int);
}; };