Skip to content

Commit cde1cc6

Browse files
jonrebmgroeck
authored andcommitted
hwmon: (ina238) Fix inconsistent whitespace
Some purely cosmetic changes in ina238.c: - When aligning definitions, do so consistently with tab stop of 8. - Use spaces instead of tabs around operators. - Align wrapped lines. Signed-off-by: Jonas Rebmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]>
1 parent 05a0ffe commit cde1cc6

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

drivers/hwmon/ina238.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
#define INA238_CONFIG_ADCRANGE BIT(4)
4343
#define SQ52206_CONFIG_ADCRANGE_HIGH BIT(4)
44-
#define SQ52206_CONFIG_ADCRANGE_LOW BIT(3)
44+
#define SQ52206_CONFIG_ADCRANGE_LOW BIT(3)
4545

4646
#define INA238_DIAG_ALERT_TMPOL BIT(7)
4747
#define INA238_DIAG_ALERT_SHNTOL BIT(6)
@@ -104,7 +104,7 @@
104104

105105
#define INA238_SHUNT_VOLTAGE_LSB 5 /* 5 uV/lsb */
106106
#define INA238_BUS_VOLTAGE_LSB 3125 /* 3.125 mV/lsb */
107-
#define INA238_DIE_TEMP_LSB 1250000 /* 125.0000 mC/lsb */
107+
#define INA238_DIE_TEMP_LSB 1250000 /* 125.0000 mC/lsb */
108108
#define SQ52206_BUS_VOLTAGE_LSB 3750 /* 3.75 mV/lsb */
109109
#define SQ52206_DIE_TEMP_LSB 78125 /* 7.8125 mC/lsb */
110110

@@ -118,12 +118,12 @@ enum ina238_ids { ina238, ina237, sq52206 };
118118

119119
struct ina238_config {
120120
bool has_power_highest; /* chip detection power peak */
121-
bool has_energy; /* chip detection energy */
122-
u8 temp_shift; /* fixed parameters for temp calculate */
121+
bool has_energy; /* chip detection energy */
122+
u8 temp_shift; /* fixed parameters for temp calculate */
123123
u32 power_calculate_factor; /* fixed parameters for power calculate */
124-
u16 config_default; /* Power-on default state */
124+
u16 config_default; /* Power-on default state */
125125
int bus_voltage_lsb; /* use for temperature calculate, uV/lsb */
126-
int temp_lsb; /* use for temperature calculate */
126+
int temp_lsb; /* use for temperature calculate */
127127
};
128128

129129
struct ina238_data {
@@ -271,7 +271,7 @@ static int ina238_read_in(struct device *dev, u32 attr, int channel,
271271
if (channel == 0)
272272
/* gain of 1 -> LSB / 4 */
273273
*val = (regval * INA238_SHUNT_VOLTAGE_LSB) *
274-
data->gain / (1000 * 4);
274+
data->gain / (1000 * 4);
275275
else
276276
*val = (regval * data->config->bus_voltage_lsb) / 1000;
277277
break;
@@ -370,7 +370,7 @@ static int ina238_read_power(struct device *dev, u32 attr, long *val)
370370
return err;
371371

372372
/* Fixed 1mA lsb, scaled by 1000000 to have result in uW */
373-
power = div_u64(regval * 1000ULL * INA238_FIXED_SHUNT * data->gain *
373+
power = div_u64(regval * 1000ULL * INA238_FIXED_SHUNT * data->gain *
374374
data->config->power_calculate_factor, 4 * 100 * data->rshunt);
375375
/* Clamp value to maximum value of long */
376376
*val = clamp_val(power, 0, LONG_MAX);
@@ -381,7 +381,7 @@ static int ina238_read_power(struct device *dev, u32 attr, long *val)
381381
return err;
382382

383383
/* Fixed 1mA lsb, scaled by 1000000 to have result in uW */
384-
power = div_u64(regval * 1000ULL * INA238_FIXED_SHUNT * data->gain *
384+
power = div_u64(regval * 1000ULL * INA238_FIXED_SHUNT * data->gain *
385385
data->config->power_calculate_factor, 4 * 100 * data->rshunt);
386386
/* Clamp value to maximum value of long */
387387
*val = clamp_val(power, 0, LONG_MAX);
@@ -395,7 +395,7 @@ static int ina238_read_power(struct device *dev, u32 attr, long *val)
395395
* Truncated 24-bit compare register, lower 8-bits are
396396
* truncated. Same conversion to/from uW as POWER register.
397397
*/
398-
power = div_u64((regval << 8) * 1000ULL * INA238_FIXED_SHUNT * data->gain *
398+
power = div_u64((regval << 8) * 1000ULL * INA238_FIXED_SHUNT * data->gain *
399399
data->config->power_calculate_factor, 4 * 100 * data->rshunt);
400400
/* Clamp value to maximum value of long */
401401
*val = clamp_val(power, 0, LONG_MAX);
@@ -448,15 +448,15 @@ static int ina238_read_temp(struct device *dev, u32 attr, long *val)
448448
return err;
449449
/* Signed, result in mC */
450450
*val = div_s64(((s64)((s16)regval) >> data->config->temp_shift) *
451-
(s64)data->config->temp_lsb, 10000);
451+
(s64)data->config->temp_lsb, 10000);
452452
break;
453453
case hwmon_temp_max:
454454
err = regmap_read(data->regmap, INA238_TEMP_LIMIT, &regval);
455455
if (err)
456456
return err;
457457
/* Signed, result in mC */
458458
*val = div_s64(((s64)((s16)regval) >> data->config->temp_shift) *
459-
(s64)data->config->temp_lsb, 10000);
459+
(s64)data->config->temp_lsb, 10000);
460460
break;
461461
case hwmon_temp_max_alarm:
462462
err = regmap_read(data->regmap, INA238_DIAG_ALERT, &regval);
@@ -501,8 +501,8 @@ static ssize_t energy1_input_show(struct device *dev,
501501
return ret;
502502

503503
/* result in uJ */
504-
energy = div_u64(regval * INA238_FIXED_SHUNT * data->gain * 16 * 10 *
505-
data->config->power_calculate_factor, 4 * data->rshunt);
504+
energy = div_u64(regval * INA238_FIXED_SHUNT * data->gain * 16 * 10 *
505+
data->config->power_calculate_factor, 4 * data->rshunt);
506506

507507
return sysfs_emit(buf, "%llu\n", energy);
508508
}

0 commit comments

Comments
 (0)