Commit ff4c4a2a authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: supply: bq27xxx: Move bq27xxx_battery_update() down 



Move the bq27xxx_battery_update() functions to below
the bq27xxx_battery_current_and_status() function.

This is just moving a block of text, no functional changes.

This is a preparation patch for making bq27xxx_battery_update() check
the status and have it call power_supply_changed() on status changes.

Fixes: 297a533b ("bq27x00: Cache battery registers")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 35092c58

drivers/power/supply/bq27xxx_battery.c

+61 −61
Original line number Diff line number Diff line
@@ -1761,67 +1761,6 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di) 
	return POWER_SUPPLY_HEALTH_GOOD;

}



static void bq27xxx_battery_update_unlocked(struct bq27xxx_device_info *di)

{

	struct bq27xxx_reg_cache cache = {0, };

	bool has_singe_flag = di->opts & BQ27XXX_O_ZERO;



	cache.flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);

	if ((cache.flags & 0xff) == 0xff)

		cache.flags = -1; /* read error */

	if (cache.flags >= 0) {

		cache.temperature = bq27xxx_battery_read_temperature(di);

		if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)

			cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);

		if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)

			cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);

		if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)

			cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);



		cache.charge_full = bq27xxx_battery_read_fcc(di);

		cache.capacity = bq27xxx_battery_read_soc(di);

		if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)

			cache.energy = bq27xxx_battery_read_energy(di);

		di->cache.flags = cache.flags;

		cache.health = bq27xxx_battery_read_health(di);

		if (di->regs[BQ27XXX_REG_CYCT] != INVALID_REG_ADDR)

			cache.cycle_count = bq27xxx_battery_read_cyct(di);



		/* We only have to read charge design full once */

		if (di->charge_design_full <= 0)

			di->charge_design_full = bq27xxx_battery_read_dcap(di);

	}



	if ((di->cache.capacity != cache.capacity) ||

	    (di->cache.flags != cache.flags))

		power_supply_changed(di->bat);



	if (memcmp(&di->cache, &cache, sizeof(cache)) != 0)

		di->cache = cache;



	di->last_update = jiffies;



	if (!di->removed && poll_interval > 0)

		mod_delayed_work(system_wq, &di->work, poll_interval * HZ);

}



void bq27xxx_battery_update(struct bq27xxx_device_info *di)

{

	mutex_lock(&di->lock);

	bq27xxx_battery_update_unlocked(di);

	mutex_unlock(&di->lock);

}

EXPORT_SYMBOL_GPL(bq27xxx_battery_update);



static void bq27xxx_battery_poll(struct work_struct *work)

{

	struct bq27xxx_device_info *di =

			container_of(work, struct bq27xxx_device_info,

				     work.work);



	bq27xxx_battery_update(di);

}



static bool bq27xxx_battery_is_full(struct bq27xxx_device_info *di, int flags)

{

	if (di->opts & BQ27XXX_O_ZERO)
@@ -1895,6 +1834,67 @@ static int bq27xxx_battery_current_and_status( 
	return 0;

}



static void bq27xxx_battery_update_unlocked(struct bq27xxx_device_info *di)

{

	struct bq27xxx_reg_cache cache = {0, };

	bool has_singe_flag = di->opts & BQ27XXX_O_ZERO;



	cache.flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);

	if ((cache.flags & 0xff) == 0xff)

		cache.flags = -1; /* read error */

	if (cache.flags >= 0) {

		cache.temperature = bq27xxx_battery_read_temperature(di);

		if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)

			cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);

		if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)

			cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);

		if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)

			cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);



		cache.charge_full = bq27xxx_battery_read_fcc(di);

		cache.capacity = bq27xxx_battery_read_soc(di);

		if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)

			cache.energy = bq27xxx_battery_read_energy(di);

		di->cache.flags = cache.flags;

		cache.health = bq27xxx_battery_read_health(di);

		if (di->regs[BQ27XXX_REG_CYCT] != INVALID_REG_ADDR)

			cache.cycle_count = bq27xxx_battery_read_cyct(di);



		/* We only have to read charge design full once */

		if (di->charge_design_full <= 0)

			di->charge_design_full = bq27xxx_battery_read_dcap(di);

	}



	if ((di->cache.capacity != cache.capacity) ||

	    (di->cache.flags != cache.flags))

		power_supply_changed(di->bat);



	if (memcmp(&di->cache, &cache, sizeof(cache)) != 0)

		di->cache = cache;



	di->last_update = jiffies;



	if (!di->removed && poll_interval > 0)

		mod_delayed_work(system_wq, &di->work, poll_interval * HZ);

}



void bq27xxx_battery_update(struct bq27xxx_device_info *di)

{

	mutex_lock(&di->lock);

	bq27xxx_battery_update_unlocked(di);

	mutex_unlock(&di->lock);

}

EXPORT_SYMBOL_GPL(bq27xxx_battery_update);



static void bq27xxx_battery_poll(struct work_struct *work)

{

	struct bq27xxx_device_info *di =

			container_of(work, struct bq27xxx_device_info,

				     work.work);



	bq27xxx_battery_update(di);

}



/*

 * Get the average power in µW

 * Return < 0 if something fails.