Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
power
/
max17042_battery.c
diff --git
a/kernel/drivers/power/max17042_battery.c
b/kernel/drivers/power/max17042_battery.c
index
9c65f13
..
da7a75f
100644
(file)
--- a/
kernel/drivers/power/max17042_battery.c
+++ b/
kernel/drivers/power/max17042_battery.c
@@
-457,13
+457,16
@@
static inline void max17042_write_model_data(struct max17042_chip *chip,
}
static inline void max17042_read_model_data(struct max17042_chip *chip,
}
static inline void max17042_read_model_data(struct max17042_chip *chip,
- u8 addr, u
32
*data, int size)
+ u8 addr, u
16
*data, int size)
{
struct regmap *map = chip->regmap;
int i;
{
struct regmap *map = chip->regmap;
int i;
+ u32 tmp;
- for (i = 0; i < size; i++)
- regmap_read(map, addr + i, &data[i]);
+ for (i = 0; i < size; i++) {
+ regmap_read(map, addr + i, &tmp);
+ data[i] = (u16)tmp;
+ }
}
static inline int max17042_model_data_compare(struct max17042_chip *chip,
}
static inline int max17042_model_data_compare(struct max17042_chip *chip,
@@
-486,7
+489,7
@@
static int max17042_init_model(struct max17042_chip *chip)
{
int ret;
int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
{
int ret;
int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
- u
32
*temp_data;
+ u
16
*temp_data;
temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
if (!temp_data)
temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
if (!temp_data)
@@
-501,7
+504,7
@@
static int max17042_init_model(struct max17042_chip *chip)
ret = max17042_model_data_compare(
chip,
chip->pdata->config_data->cell_char_tbl,
ret = max17042_model_data_compare(
chip,
chip->pdata->config_data->cell_char_tbl,
-
(u16 *)
temp_data,
+ temp_data,
table_size);
max10742_lock_model(chip);
table_size);
max10742_lock_model(chip);
@@
-514,7
+517,7
@@
static int max17042_verify_model_lock(struct max17042_chip *chip)
{
int i;
int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
{
int i;
int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
- u
32
*temp_data;
+ u
16
*temp_data;
int ret = 0;
temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
int ret = 0;
temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);