Skip to content

Commit d84510d

Browse files
Dzmitry Sankouskisre
Dzmitry Sankouski
authored and
sre
committed
power: supply: max77705_charger: refactoring: rename charger to chg
Rename struct max77705_charger_data variable to chg for consistency. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent a96d68e commit d84510d

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎drivers/power/supply/max77705_charger.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ static enum power_supply_property max77705_charger_props[] = {
4242

4343
static int max77705_chgin_irq(void *irq_drv_data)
4444
{
45-
struct max77705_charger_data *charger = irq_drv_data;
45+
struct max77705_charger_data *chg = irq_drv_data;
4646

47-
queue_work(charger->wqueue, &charger->chgin_work);
47+
queue_work(chg->wqueue, &chg->chgin_work);
4848

4949
return 0;
5050
}
@@ -109,19 +109,19 @@ static int max77705_get_online(struct regmap *regmap, int *val)
109109
return 0;
110110
}
111111

112-
static int max77705_check_battery(struct max77705_charger_data *charger, int *val)
112+
static int max77705_check_battery(struct max77705_charger_data *chg, int *val)
113113
{
114114
unsigned int reg_data;
115115
unsigned int reg_data2;
116-
struct regmap *regmap = charger->regmap;
116+
struct regmap *regmap = chg->regmap;
117117

118118
regmap_read(regmap, MAX77705_CHG_REG_INT_OK, &reg_data);
119119

120-
dev_dbg(charger->dev, "CHG_INT_OK(0x%x)\n", reg_data);
120+
dev_dbg(chg->dev, "CHG_INT_OK(0x%x)\n", reg_data);
121121

122122
regmap_read(regmap, MAX77705_CHG_REG_DETAILS_00, &reg_data2);
123123

124-
dev_dbg(charger->dev, "CHG_DETAILS00(0x%x)\n", reg_data2);
124+
dev_dbg(chg->dev, "CHG_DETAILS00(0x%x)\n", reg_data2);
125125

126126
if ((reg_data & MAX77705_BATP_OK) || !(reg_data2 & MAX77705_BATP_DTLS))
127127
*val = true;
@@ -131,9 +131,9 @@ static int max77705_check_battery(struct max77705_charger_data *charger, int *va
131131
return 0;
132132
}
133133

134-
static int max77705_get_charge_type(struct max77705_charger_data *charger, int *val)
134+
static int max77705_get_charge_type(struct max77705_charger_data *chg, int *val)
135135
{
136-
struct regmap *regmap = charger->regmap;
136+
struct regmap *regmap = chg->regmap;
137137
unsigned int reg_data;
138138

139139
regmap_read(regmap, MAX77705_CHG_REG_CNFG_09, &reg_data);
@@ -159,9 +159,9 @@ static int max77705_get_charge_type(struct max77705_charger_data *charger, int *
159159
return 0;
160160
}
161161

162-
static int max77705_get_status(struct max77705_charger_data *charger, int *val)
162+
static int max77705_get_status(struct max77705_charger_data *chg, int *val)
163163
{
164-
struct regmap *regmap = charger->regmap;
164+
struct regmap *regmap = chg->regmap;
165165
unsigned int reg_data;
166166

167167
regmap_read(regmap, MAX77705_CHG_REG_CNFG_09, &reg_data);
@@ -234,49 +234,49 @@ static int max77705_get_vbus_state(struct regmap *regmap, int *value)
234234
return 0;
235235
}
236236

237-
static int max77705_get_battery_health(struct max77705_charger_data *charger,
237+
static int max77705_get_battery_health(struct max77705_charger_data *chg,
238238
int *value)
239239
{
240-
struct regmap *regmap = charger->regmap;
240+
struct regmap *regmap = chg->regmap;
241241
unsigned int bat_dtls;
242242

243243
regmap_read(regmap, MAX77705_CHG_REG_DETAILS_01, &bat_dtls);
244244
bat_dtls = ((bat_dtls & MAX77705_BAT_DTLS) >> MAX77705_BAT_DTLS_SHIFT);
245245

246246
switch (bat_dtls) {
247247
case MAX77705_BATTERY_NOBAT:
248-
dev_dbg(charger->dev, "%s: No battery and the charger is suspended\n",
248+
dev_dbg(chg->dev, "%s: No battery and the chg is suspended\n",
249249
__func__);
250250
*value = POWER_SUPPLY_HEALTH_NO_BATTERY;
251251
break;
252252
case MAX77705_BATTERY_PREQUALIFICATION:
253-
dev_dbg(charger->dev, "%s: battery is okay but its voltage is low(~VPQLB)\n",
253+
dev_dbg(chg->dev, "%s: battery is okay but its voltage is low(~VPQLB)\n",
254254
__func__);
255255
break;
256256
case MAX77705_BATTERY_DEAD:
257-
dev_dbg(charger->dev, "%s: battery dead\n", __func__);
257+
dev_dbg(chg->dev, "%s: battery dead\n", __func__);
258258
*value = POWER_SUPPLY_HEALTH_DEAD;
259259
break;
260260
case MAX77705_BATTERY_GOOD:
261261
case MAX77705_BATTERY_LOWVOLTAGE:
262262
*value = POWER_SUPPLY_HEALTH_GOOD;
263263
break;
264264
case MAX77705_BATTERY_OVERVOLTAGE:
265-
dev_dbg(charger->dev, "%s: battery ovp\n", __func__);
265+
dev_dbg(chg->dev, "%s: battery ovp\n", __func__);
266266
*value = POWER_SUPPLY_HEALTH_OVERVOLTAGE;
267267
break;
268268
default:
269-
dev_dbg(charger->dev, "%s: battery unknown\n", __func__);
269+
dev_dbg(chg->dev, "%s: battery unknown\n", __func__);
270270
*value = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
271271
break;
272272
}
273273

274274
return 0;
275275
}
276276

277-
static int max77705_get_health(struct max77705_charger_data *charger, int *val)
277+
static int max77705_get_health(struct max77705_charger_data *chg, int *val)
278278
{
279-
struct regmap *regmap = charger->regmap;
279+
struct regmap *regmap = chg->regmap;
280280
int ret, is_online = 0;
281281

282282
ret = max77705_get_online(regmap, &is_online);
@@ -287,15 +287,15 @@ static int max77705_get_health(struct max77705_charger_data *charger, int *val)
287287
if (ret || (*val != POWER_SUPPLY_HEALTH_GOOD))
288288
return ret;
289289
}
290-
return max77705_get_battery_health(charger, val);
290+
return max77705_get_battery_health(chg, val);
291291
}
292292

293-
static int max77705_get_input_current(struct max77705_charger_data *charger,
293+
static int max77705_get_input_current(struct max77705_charger_data *chg,
294294
int *val)
295295
{
296296
unsigned int reg_data;
297297
int get_current = 0;
298-
struct regmap *regmap = charger->regmap;
298+
struct regmap *regmap = chg->regmap;
299299

300300
regmap_read(regmap, MAX77705_CHG_REG_CNFG_09, &reg_data);
301301

@@ -313,11 +313,11 @@ static int max77705_get_input_current(struct max77705_charger_data *charger,
313313
return 0;
314314
}
315315

316-
static int max77705_get_charge_current(struct max77705_charger_data *charger,
316+
static int max77705_get_charge_current(struct max77705_charger_data *chg,
317317
int *val)
318318
{
319319
unsigned int reg_data;
320-
struct regmap *regmap = charger->regmap;
320+
struct regmap *regmap = chg->regmap;
321321

322322
regmap_read(regmap, MAX77705_CHG_REG_CNFG_02, &reg_data);
323323
reg_data &= MAX77705_CHG_CC;
@@ -327,12 +327,12 @@ static int max77705_get_charge_current(struct max77705_charger_data *charger,
327327
return 0;
328328
}
329329

330-
static int max77705_set_float_voltage(struct max77705_charger_data *charger,
330+
static int max77705_set_float_voltage(struct max77705_charger_data *chg,
331331
int float_voltage)
332332
{
333333
int float_voltage_mv;
334334
unsigned int reg_data = 0;
335-
struct regmap *regmap = charger->regmap;
335+
struct regmap *regmap = chg->regmap;
336336

337337
float_voltage_mv = float_voltage / 1000;
338338
reg_data = float_voltage_mv <= 4000 ? 0x0 :
@@ -345,12 +345,12 @@ static int max77705_set_float_voltage(struct max77705_charger_data *charger,
345345
(reg_data << MAX77705_CHG_CV_PRM_SHIFT));
346346
}
347347

348-
static int max77705_get_float_voltage(struct max77705_charger_data *charger,
348+
static int max77705_get_float_voltage(struct max77705_charger_data *chg,
349349
int *val)
350350
{
351351
unsigned int reg_data = 0;
352352
int voltage_mv;
353-
struct regmap *regmap = charger->regmap;
353+
struct regmap *regmap = chg->regmap;
354354

355355
regmap_read(regmap, MAX77705_CHG_REG_CNFG_04, &reg_data);
356356
reg_data &= MAX77705_CHG_PRM_MASK;
@@ -365,28 +365,28 @@ static int max77705_chg_get_property(struct power_supply *psy,
365365
enum power_supply_property psp,
366366
union power_supply_propval *val)
367367
{
368-
struct max77705_charger_data *charger = power_supply_get_drvdata(psy);
369-
struct regmap *regmap = charger->regmap;
368+
struct max77705_charger_data *chg = power_supply_get_drvdata(psy);
369+
struct regmap *regmap = chg->regmap;
370370

371371
switch (psp) {
372372
case POWER_SUPPLY_PROP_ONLINE:
373373
return max77705_get_online(regmap, &val->intval);
374374
case POWER_SUPPLY_PROP_PRESENT:
375-
return max77705_check_battery(charger, &val->intval);
375+
return max77705_check_battery(chg, &val->intval);
376376
case POWER_SUPPLY_PROP_STATUS:
377-
return max77705_get_status(charger, &val->intval);
377+
return max77705_get_status(chg, &val->intval);
378378
case POWER_SUPPLY_PROP_CHARGE_TYPE:
379-
return max77705_get_charge_type(charger, &val->intval);
379+
return max77705_get_charge_type(chg, &val->intval);
380380
case POWER_SUPPLY_PROP_HEALTH:
381-
return max77705_get_health(charger, &val->intval);
381+
return max77705_get_health(chg, &val->intval);
382382
case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
383-
return max77705_get_input_current(charger, &val->intval);
383+
return max77705_get_input_current(chg, &val->intval);
384384
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
385-
return max77705_get_charge_current(charger, &val->intval);
385+
return max77705_get_charge_current(chg, &val->intval);
386386
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
387-
return max77705_get_float_voltage(charger, &val->intval);
387+
return max77705_get_float_voltage(chg, &val->intval);
388388
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
389-
val->intval = charger->bat_info->voltage_max_design_uv;
389+
val->intval = chg->bat_info->voltage_max_design_uv;
390390
break;
391391
case POWER_SUPPLY_PROP_MODEL_NAME:
392392
val->strval = max77705_charger_model;
@@ -410,10 +410,10 @@ static const struct power_supply_desc max77705_charger_psy_desc = {
410410

411411
static void max77705_chgin_isr_work(struct work_struct *work)
412412
{
413-
struct max77705_charger_data *charger =
413+
struct max77705_charger_data *chg =
414414
container_of(work, struct max77705_charger_data, chgin_work);
415415

416-
power_supply_changed(charger->psy_chg);
416+
power_supply_changed(chg->psy_chg);
417417
}
418418

419419
static void max77705_charger_initialize(struct max77705_charger_data *chg)

0 commit comments

Comments
 (0)