Unverified Commit de824cc9 authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Mark Brown
Browse files

power: supply: bd70528: rename linear_range to avoid collision 



Follow-up patches in this series will add a generic struct
linear_range. Rename bd70528 internal struct to avoid collision.

Signed-off-by: default avatarMatti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/286b1ae0adc1c08e7b644cbdc1a43eb2e0644647.1588944082.git.matti.vaittinen@fi.rohmeurope.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 33d599f0

drivers/power/supply/bd70528-charger.c

+5 −5
Original line number Diff line number Diff line
@@ -335,14 +335,14 @@ static int bd70528_get_present(struct bd70528_psy *bdpsy, int *val) 
	return 0;

}



struct linear_range {

struct bd70528_linear_range {

	int min;

	int step;

	int vals;

	int low_sel;

};



static const struct linear_range current_limit_ranges[] = {

static const struct bd70528_linear_range current_limit_ranges[] = {

	{

		.min = 5,

		.step = 1,
@@ -374,7 +374,7 @@ static const struct linear_range current_limit_ranges[] = { 
 * voltage for low temperatures. The driver currently only reads

 * the charge current at room temperature. We do set both though.

 */

static const struct linear_range warm_charge_curr[] = {

static const struct bd70528_linear_range warm_charge_curr[] = {

	{

		.min = 10,

		.step = 10,
@@ -398,7 +398,7 @@ static const struct linear_range warm_charge_curr[] = { 
#define MAX_WARM_CHG_CURR_SEL 0x1f

#define MIN_CHG_CURR_SEL 0x0



static int find_value_for_selector_low(const struct linear_range *r,

static int find_value_for_selector_low(const struct bd70528_linear_range *r,

				       int selectors, unsigned int sel,

				       unsigned int *val)

{
@@ -420,7 +420,7 @@ static int find_value_for_selector_low(const struct linear_range *r, 
 * I guess it is enough if we use voltage/current which is closest (below)

 * the requested?

 */

static int find_selector_for_value_low(const struct linear_range *r,

static int find_selector_for_value_low(const struct bd70528_linear_range *r,

				       int selectors, unsigned int val,

				       unsigned int *sel, bool *found)

{