Skip to content

Commit 765698e

Browse files
olskycarlescufi
olsky
authored and
carlescufi
committed
drivers: sensor: bq274xx: rename bq274xx to data
Shorten lines lengths. data is a common driver data struct point name. Signed-off-by: Oleh Lozynskyy <[email protected]>
1 parent f3668df commit 765698e

File tree

1 file changed

+37
-37
lines changed

1 file changed

+37
-37
lines changed

‎drivers/sensor/bq274xx/bq274xx.c

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -151,71 +151,71 @@ static int bq274xx_channel_get(const struct device *dev,
151151
enum sensor_channel chan,
152152
struct sensor_value *val)
153153
{
154-
struct bq274xx_data *bq274xx = dev->data;
154+
struct bq274xx_data *data = dev->data;
155155
float int_temp;
156156

157157
switch (chan) {
158158
case SENSOR_CHAN_GAUGE_VOLTAGE:
159-
val->val1 = ((bq274xx->voltage / 1000));
160-
val->val2 = ((bq274xx->voltage % 1000) * 1000U);
159+
val->val1 = ((data->voltage / 1000));
160+
val->val2 = ((data->voltage % 1000) * 1000U);
161161
break;
162162

163163
case SENSOR_CHAN_GAUGE_AVG_CURRENT:
164-
val->val1 = ((bq274xx->avg_current / 1000));
165-
val->val2 = ((bq274xx->avg_current % 1000) * 1000U);
164+
val->val1 = ((data->avg_current / 1000));
165+
val->val2 = ((data->avg_current % 1000) * 1000U);
166166
break;
167167

168168
case SENSOR_CHAN_GAUGE_STDBY_CURRENT:
169-
val->val1 = ((bq274xx->stdby_current / 1000));
170-
val->val2 = ((bq274xx->stdby_current % 1000) * 1000U);
169+
val->val1 = ((data->stdby_current / 1000));
170+
val->val2 = ((data->stdby_current % 1000) * 1000U);
171171
break;
172172

173173
case SENSOR_CHAN_GAUGE_MAX_LOAD_CURRENT:
174-
val->val1 = ((bq274xx->max_load_current / 1000));
175-
val->val2 = ((bq274xx->max_load_current % 1000) * 1000U);
174+
val->val1 = ((data->max_load_current / 1000));
175+
val->val2 = ((data->max_load_current % 1000) * 1000U);
176176
break;
177177

178178
case SENSOR_CHAN_GAUGE_TEMP:
179-
int_temp = (bq274xx->internal_temperature * 0.1f);
179+
int_temp = (data->internal_temperature * 0.1f);
180180
int_temp = int_temp - 273.15f;
181181
val->val1 = (int32_t)int_temp;
182182
val->val2 = (int_temp - (int32_t)int_temp) * 1000000;
183183
break;
184184

185185
case SENSOR_CHAN_GAUGE_STATE_OF_CHARGE:
186-
val->val1 = bq274xx->state_of_charge;
186+
val->val1 = data->state_of_charge;
187187
val->val2 = 0;
188188
break;
189189

190190
case SENSOR_CHAN_GAUGE_STATE_OF_HEALTH:
191-
val->val1 = bq274xx->state_of_health;
191+
val->val1 = data->state_of_health;
192192
val->val2 = 0;
193193
break;
194194

195195
case SENSOR_CHAN_GAUGE_FULL_CHARGE_CAPACITY:
196-
val->val1 = (bq274xx->full_charge_capacity / 1000);
197-
val->val2 = ((bq274xx->full_charge_capacity % 1000) * 1000U);
196+
val->val1 = (data->full_charge_capacity / 1000);
197+
val->val2 = ((data->full_charge_capacity % 1000) * 1000U);
198198
break;
199199

200200
case SENSOR_CHAN_GAUGE_REMAINING_CHARGE_CAPACITY:
201-
val->val1 = (bq274xx->remaining_charge_capacity / 1000);
201+
val->val1 = (data->remaining_charge_capacity / 1000);
202202
val->val2 =
203-
((bq274xx->remaining_charge_capacity % 1000) * 1000U);
203+
((data->remaining_charge_capacity % 1000) * 1000U);
204204
break;
205205

206206
case SENSOR_CHAN_GAUGE_NOM_AVAIL_CAPACITY:
207-
val->val1 = (bq274xx->nom_avail_capacity / 1000);
208-
val->val2 = ((bq274xx->nom_avail_capacity % 1000) * 1000U);
207+
val->val1 = (data->nom_avail_capacity / 1000);
208+
val->val2 = ((data->nom_avail_capacity % 1000) * 1000U);
209209
break;
210210

211211
case SENSOR_CHAN_GAUGE_FULL_AVAIL_CAPACITY:
212-
val->val1 = (bq274xx->full_avail_capacity / 1000);
213-
val->val2 = ((bq274xx->full_avail_capacity % 1000) * 1000U);
212+
val->val1 = (data->full_avail_capacity / 1000);
213+
val->val2 = ((data->full_avail_capacity % 1000) * 1000U);
214214
break;
215215

216216
case SENSOR_CHAN_GAUGE_AVG_POWER:
217-
val->val1 = (bq274xx->avg_power / 1000);
218-
val->val2 = ((bq274xx->avg_power % 1000) * 1000U);
217+
val->val1 = (data->avg_power / 1000);
218+
val->val2 = ((data->avg_power % 1000) * 1000U);
219219
break;
220220

221221
default:
@@ -228,10 +228,10 @@ static int bq274xx_channel_get(const struct device *dev,
228228
static int bq274xx_sample_fetch(const struct device *dev,
229229
enum sensor_channel chan)
230230
{
231-
struct bq274xx_data *bq274xx = dev->data;
231+
struct bq274xx_data *data = dev->data;
232232
int ret = 0;
233233

234-
if (!bq274xx->configured) {
234+
if (!data->configured) {
235235
ret = bq274xx_gauge_configure(dev);
236236

237237
if (ret < 0) {
@@ -242,7 +242,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
242242
switch (chan) {
243243
case SENSOR_CHAN_GAUGE_VOLTAGE:
244244
ret = bq274xx_command_reg_read(
245-
dev, BQ274XX_COMMAND_VOLTAGE, &bq274xx->voltage);
245+
dev, BQ274XX_COMMAND_VOLTAGE, &data->voltage);
246246
if (ret < 0) {
247247
LOG_ERR("Failed to read voltage");
248248
return -EIO;
@@ -252,7 +252,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
252252
case SENSOR_CHAN_GAUGE_AVG_CURRENT:
253253
ret = bq274xx_command_reg_read(dev,
254254
BQ274XX_COMMAND_AVG_CURRENT,
255-
&bq274xx->avg_current);
255+
&data->avg_current);
256256
if (ret < 0) {
257257
LOG_ERR("Failed to read average current ");
258258
return -EIO;
@@ -262,7 +262,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
262262
case SENSOR_CHAN_GAUGE_TEMP:
263263
ret = bq274xx_command_reg_read(
264264
dev, BQ274XX_COMMAND_INT_TEMP,
265-
&bq274xx->internal_temperature);
265+
&data->internal_temperature);
266266
if (ret < 0) {
267267
LOG_ERR("Failed to read internal temperature");
268268
return -EIO;
@@ -272,7 +272,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
272272
case SENSOR_CHAN_GAUGE_STDBY_CURRENT:
273273
ret = bq274xx_command_reg_read(dev,
274274
BQ274XX_COMMAND_STDBY_CURRENT,
275-
&bq274xx->stdby_current);
275+
&data->stdby_current);
276276
if (ret < 0) {
277277
LOG_ERR("Failed to read standby current");
278278
return -EIO;
@@ -282,7 +282,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
282282
case SENSOR_CHAN_GAUGE_MAX_LOAD_CURRENT:
283283
ret = bq274xx_command_reg_read(dev,
284284
BQ274XX_COMMAND_MAX_CURRENT,
285-
&bq274xx->max_load_current);
285+
&data->max_load_current);
286286
if (ret < 0) {
287287
LOG_ERR("Failed to read maximum current");
288288
return -EIO;
@@ -291,7 +291,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
291291

292292
case SENSOR_CHAN_GAUGE_STATE_OF_CHARGE:
293293
ret = bq274xx_command_reg_read(dev, BQ274XX_COMMAND_SOC,
294-
&bq274xx->state_of_charge);
294+
&data->state_of_charge);
295295
if (ret < 0) {
296296
LOG_ERR("Failed to read state of charge");
297297
return -EIO;
@@ -301,7 +301,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
301301
case SENSOR_CHAN_GAUGE_FULL_CHARGE_CAPACITY:
302302
ret = bq274xx_command_reg_read(
303303
dev, BQ274XX_COMMAND_FULL_CAPACITY,
304-
&bq274xx->full_charge_capacity);
304+
&data->full_charge_capacity);
305305
if (ret < 0) {
306306
LOG_ERR("Failed to read full charge capacity");
307307
return -EIO;
@@ -311,7 +311,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
311311
case SENSOR_CHAN_GAUGE_REMAINING_CHARGE_CAPACITY:
312312
ret = bq274xx_command_reg_read(
313313
dev, BQ274XX_COMMAND_REM_CAPACITY,
314-
&bq274xx->remaining_charge_capacity);
314+
&data->remaining_charge_capacity);
315315
if (ret < 0) {
316316
LOG_ERR("Failed to read remaining charge capacity");
317317
return -EIO;
@@ -321,7 +321,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
321321
case SENSOR_CHAN_GAUGE_NOM_AVAIL_CAPACITY:
322322
ret = bq274xx_command_reg_read(dev,
323323
BQ274XX_COMMAND_NOM_CAPACITY,
324-
&bq274xx->nom_avail_capacity);
324+
&data->nom_avail_capacity);
325325
if (ret < 0) {
326326
LOG_ERR("Failed to read nominal available capacity");
327327
return -EIO;
@@ -332,7 +332,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
332332
ret =
333333
bq274xx_command_reg_read(dev,
334334
BQ274XX_COMMAND_AVAIL_CAPACITY,
335-
&bq274xx->full_avail_capacity);
335+
&data->full_avail_capacity);
336336
if (ret < 0) {
337337
LOG_ERR("Failed to read full available capacity");
338338
return -EIO;
@@ -342,7 +342,7 @@ static int bq274xx_sample_fetch(const struct device *dev,
342342
case SENSOR_CHAN_GAUGE_AVG_POWER:
343343
ret = bq274xx_command_reg_read(dev,
344344
BQ274XX_COMMAND_AVG_POWER,
345-
&bq274xx->avg_power);
345+
&data->avg_power);
346346
if (ret < 0) {
347347
LOG_ERR("Failed to read battery average power");
348348
return -EIO;
@@ -351,9 +351,9 @@ static int bq274xx_sample_fetch(const struct device *dev,
351351

352352
case SENSOR_CHAN_GAUGE_STATE_OF_HEALTH:
353353
ret = bq274xx_command_reg_read(dev, BQ274XX_COMMAND_SOH,
354-
&bq274xx->state_of_health);
354+
&data->state_of_health);
355355

356-
bq274xx->state_of_health = (bq274xx->state_of_health) & 0x00FF;
356+
data->state_of_health = (data->state_of_health) & 0x00FF;
357357

358358
if (ret < 0) {
359359
LOG_ERR("Failed to read state of health");

0 commit comments

Comments
 (0)