On 7/30/20 10:31 AM, Dan Murphy wrote:
> Fix spacing style issues with the chip data array. As well as fix
> missing new line after variable declaration.
>
> Signed-off-by: Dan Murphy <dmur...@ti.com>
> ---
> drivers/power/supply/bq27xxx_battery.c | 63 ++++++++++++++------------
> 1 file changed, 33 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/power/supply/bq27xxx_battery.c
> b/drivers/power/supply/bq27xxx_battery.c
> index 8b112449ace8..e58039db8e64 100644
> --- a/drivers/power/supply/bq27xxx_battery.c
> +++ b/drivers/power/supply/bq27xxx_battery.c
> @@ -871,35 +871,35 @@ static struct {
> enum power_supply_property *props;
> size_t props_size;
> } bq27xxx_chip_data[] = {
> - [BQ27000] = BQ27XXX_DATA(bq27000, 0 , BQ27XXX_O_ZERO),
> - [BQ27010] = BQ27XXX_DATA(bq27010, 0 , BQ27XXX_O_ZERO),
> - [BQ2750X] = BQ27XXX_DATA(bq2750x, 0 , BQ27XXX_O_OTDC),
> - [BQ2751X] = BQ27XXX_DATA(bq2751x, 0 , BQ27XXX_O_OTDC),
> - [BQ2752X] = BQ27XXX_DATA(bq2752x, 0 , BQ27XXX_O_OTDC),
> - [BQ27500] = BQ27XXX_DATA(bq27500, 0x04143672, BQ27XXX_O_OTDC),
> - [BQ27510G1] = BQ27XXX_DATA(bq27510g1, 0 , BQ27XXX_O_OTDC),
> - [BQ27510G2] = BQ27XXX_DATA(bq27510g2, 0 , BQ27XXX_O_OTDC),
> - [BQ27510G3] = BQ27XXX_DATA(bq27510g3, 0 , BQ27XXX_O_OTDC),
> - [BQ27520G1] = BQ27XXX_DATA(bq27520g1, 0 , BQ27XXX_O_OTDC),
> - [BQ27520G2] = BQ27XXX_DATA(bq27520g2, 0 , BQ27XXX_O_OTDC),
> - [BQ27520G3] = BQ27XXX_DATA(bq27520g3, 0 , BQ27XXX_O_OTDC),
> - [BQ27520G4] = BQ27XXX_DATA(bq27520g4, 0 , BQ27XXX_O_OTDC),
> - [BQ27521] = BQ27XXX_DATA(bq27521, 0 , 0),
> - [BQ27530] = BQ27XXX_DATA(bq27530, 0 , BQ27XXX_O_UTOT),
> - [BQ27531] = BQ27XXX_DATA(bq27531, 0 , BQ27XXX_O_UTOT),
> - [BQ27541] = BQ27XXX_DATA(bq27541, 0 , BQ27XXX_O_OTDC),
> - [BQ27542] = BQ27XXX_DATA(bq27542, 0 , BQ27XXX_O_OTDC),
> - [BQ27546] = BQ27XXX_DATA(bq27546, 0 , BQ27XXX_O_OTDC),
> - [BQ27742] = BQ27XXX_DATA(bq27742, 0 , BQ27XXX_O_OTDC),
> - [BQ27545] = BQ27XXX_DATA(bq27545, 0x04143672, BQ27XXX_O_OTDC),
> - [BQ27411] = BQ27XXX_DATA(bq27411, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> - [BQ27421] = BQ27XXX_DATA(bq27421, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> - [BQ27425] = BQ27XXX_DATA(bq27425, 0x04143672, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP),
> - [BQ27426] = BQ27XXX_DATA(bq27426, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> - [BQ27441] = BQ27XXX_DATA(bq27441, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> - [BQ27621] = BQ27XXX_DATA(bq27621, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> - [BQ27Z561] = BQ27XXX_DATA(bq27z561, 0 , BQ27Z561_O_BITS),
> - [BQ28Z610] = BQ27XXX_DATA(bq28z610, 0 , BQ27Z561_O_BITS),
> + [BQ27000] = BQ27XXX_DATA(bq27000, 0, BQ27XXX_O_ZERO),
The spacing before improved readability.
Andrew
> + [BQ27010] = BQ27XXX_DATA(bq27010, 0, BQ27XXX_O_ZERO),
> + [BQ2750X] = BQ27XXX_DATA(bq2750x, 0, BQ27XXX_O_OTDC),
> + [BQ2751X] = BQ27XXX_DATA(bq2751x, 0, BQ27XXX_O_OTDC),
> + [BQ2752X] = BQ27XXX_DATA(bq2752x, 0, BQ27XXX_O_OTDC),
> + [BQ27500] = BQ27XXX_DATA(bq27500, 0x04143672, BQ27XXX_O_OTDC),
> + [BQ27510G1] = BQ27XXX_DATA(bq27510g1, 0, BQ27XXX_O_OTDC),
> + [BQ27510G2] = BQ27XXX_DATA(bq27510g2, 0, BQ27XXX_O_OTDC),
> + [BQ27510G3] = BQ27XXX_DATA(bq27510g3, 0, BQ27XXX_O_OTDC),
> + [BQ27520G1] = BQ27XXX_DATA(bq27520g1, 0, BQ27XXX_O_OTDC),
> + [BQ27520G2] = BQ27XXX_DATA(bq27520g2, 0, BQ27XXX_O_OTDC),
> + [BQ27520G3] = BQ27XXX_DATA(bq27520g3, 0, BQ27XXX_O_OTDC),
> + [BQ27520G4] = BQ27XXX_DATA(bq27520g4, 0, BQ27XXX_O_OTDC),
> + [BQ27521] = BQ27XXX_DATA(bq27521, 0, 0),
> + [BQ27530] = BQ27XXX_DATA(bq27530, 0, BQ27XXX_O_UTOT),
> + [BQ27531] = BQ27XXX_DATA(bq27531, 0, BQ27XXX_O_UTOT),
> + [BQ27541] = BQ27XXX_DATA(bq27541, 0, BQ27XXX_O_OTDC),
> + [BQ27542] = BQ27XXX_DATA(bq27542, 0, BQ27XXX_O_OTDC),
> + [BQ27546] = BQ27XXX_DATA(bq27546, 0, BQ27XXX_O_OTDC),
> + [BQ27742] = BQ27XXX_DATA(bq27742, 0, BQ27XXX_O_OTDC),
> + [BQ27545] = BQ27XXX_DATA(bq27545, 0x04143672, BQ27XXX_O_OTDC),
> + [BQ27411] = BQ27XXX_DATA(bq27411, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> + [BQ27421] = BQ27XXX_DATA(bq27421, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> + [BQ27425] = BQ27XXX_DATA(bq27425, 0x04143672, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP),
> + [BQ27426] = BQ27XXX_DATA(bq27426, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> + [BQ27441] = BQ27XXX_DATA(bq27441, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> + [BQ27621] = BQ27XXX_DATA(bq27621, 0x80008000, BQ27XXX_O_UTOT |
> BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
> + [BQ27Z561] = BQ27XXX_DATA(bq27z561, 0, BQ27Z561_O_BITS),
> + [BQ28Z610] = BQ27XXX_DATA(bq28z610, 0, BQ27Z561_O_BITS),
> };
>
> static DEFINE_MUTEX(bq27xxx_list_lock);
> @@ -1235,6 +1235,7 @@ static int bq27xxx_battery_cfgupdate_priv(struct
> bq27xxx_device_info *di, bool a
> static inline int bq27xxx_battery_set_cfgupdate(struct bq27xxx_device_info
> *di)
> {
> int ret = bq27xxx_battery_cfgupdate_priv(di, true);
> +
> if (ret < 0 && ret != -EINVAL)
> dev_err(di->dev, "bus error on set_cfgupdate: %d\n", ret);
>
> @@ -1244,6 +1245,7 @@ static inline int bq27xxx_battery_set_cfgupdate(struct
> bq27xxx_device_info *di)
> static inline int bq27xxx_battery_soft_reset(struct bq27xxx_device_info *di)
> {
> int ret = bq27xxx_battery_cfgupdate_priv(di, false);
> +
> if (ret < 0 && ret != -EINVAL)
> dev_err(di->dev, "bus error on soft_reset: %d\n", ret);
>
> @@ -1338,6 +1340,7 @@ static void bq27xxx_battery_set_config(struct
> bq27xxx_device_info *di,
>
> if (info->voltage_min_design_uv != -EINVAL) {
> bool same = bd.class == bt.class && bd.block == bt.block;
> +
> if (!same)
> bq27xxx_battery_read_dm_block(di, &bt);
> bq27xxx_battery_update_dm_block(di, same ? &bd : &bt,
> @@ -1611,7 +1614,7 @@ static bool bq27xxx_battery_overtemp(struct
> bq27xxx_device_info *di, u16 flags)
> {
> if (di->opts & BQ27XXX_O_OTDC)
> return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD);
> - if (di->opts & BQ27XXX_O_UTOT)
> + if (di->opts & BQ27XXX_O_UTOT)
> return flags & BQ27XXX_FLAG_OT;
>
> return false;
>
