Skip to content

Commit de824cc

Browse files
M-Vaittinenbroonie
authored andcommitted
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: Matti Vaittinen <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Link: https://lore.kernel.org/r/286b1ae0adc1c08e7b644cbdc1a43eb2e0644647.1588944082.git.matti.vaittinen@fi.rohmeurope.com Signed-off-by: Mark Brown <[email protected]>
1 parent 33d599f commit de824cc

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/power/supply/bd70528-charger.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,14 +335,14 @@ static int bd70528_get_present(struct bd70528_psy *bdpsy, int *val)
335335
return 0;
336336
}
337337

338-
struct linear_range {
338+
struct bd70528_linear_range {
339339
int min;
340340
int step;
341341
int vals;
342342
int low_sel;
343343
};
344344

345-
static const struct linear_range current_limit_ranges[] = {
345+
static const struct bd70528_linear_range current_limit_ranges[] = {
346346
{
347347
.min = 5,
348348
.step = 1,
@@ -374,7 +374,7 @@ static const struct linear_range current_limit_ranges[] = {
374374
* voltage for low temperatures. The driver currently only reads
375375
* the charge current at room temperature. We do set both though.
376376
*/
377-
static const struct linear_range warm_charge_curr[] = {
377+
static const struct bd70528_linear_range warm_charge_curr[] = {
378378
{
379379
.min = 10,
380380
.step = 10,
@@ -398,7 +398,7 @@ static const struct linear_range warm_charge_curr[] = {
398398
#define MAX_WARM_CHG_CURR_SEL 0x1f
399399
#define MIN_CHG_CURR_SEL 0x0
400400

401-
static int find_value_for_selector_low(const struct linear_range *r,
401+
static int find_value_for_selector_low(const struct bd70528_linear_range *r,
402402
int selectors, unsigned int sel,
403403
unsigned int *val)
404404
{
@@ -420,7 +420,7 @@ static int find_value_for_selector_low(const struct linear_range *r,
420420
* I guess it is enough if we use voltage/current which is closest (below)
421421
* the requested?
422422
*/
423-
static int find_selector_for_value_low(const struct linear_range *r,
423+
static int find_selector_for_value_low(const struct bd70528_linear_range *r,
424424
int selectors, unsigned int val,
425425
unsigned int *sel, bool *found)
426426
{

0 commit comments

Comments
 (0)