Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: temperature: mlx90632 Style alignment for the driver
Changing and aligning the overall style of the driver with the recent
reviews. There is no functional change, only type generalization and
moving to the reverse Christmas tree for variable declarations.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Crt Mori <cmo@melexis.com>
Link: https://lore.kernel.org/r/d59aad00891c1a64e044a0f5bc7d40e42d47e9c7.1666606912.git.cmo@melexis.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Crt Mori
and committed by
Jonathan Cameron
a95ccebd
2ca0b16f
+36
-29
+36
-29
drivers/iio/temperature/mlx90632.c
+36
-29
drivers/iio/temperature/mlx90632.c
···
219
219
.cache_type = REGCACHE_RBTREE,
220
220
};
221
221
222
-
static s32 mlx90632_pwr_set_sleep_step(struct regmap *regmap)
222
+
static int mlx90632_pwr_set_sleep_step(struct regmap *regmap)
223
223
{
224
224
struct mlx90632_data *data =
225
225
iio_priv(dev_get_drvdata(regmap_get_device(regmap)));
226
-
s32 ret;
226
+
int ret;
227
227
228
228
if (data->powerstatus == MLX90632_PWR_STATUS_SLEEP_STEP)
229
229
return 0;
···
234
234
return ret;
235
235
236
236
data->powerstatus = MLX90632_PWR_STATUS_SLEEP_STEP;
237
-
return ret;
237
+
return 0;
238
238
}
239
239
240
-
static s32 mlx90632_pwr_continuous(struct regmap *regmap)
240
+
static int mlx90632_pwr_continuous(struct regmap *regmap)
241
241
{
242
242
struct mlx90632_data *data =
243
243
iio_priv(dev_get_drvdata(regmap_get_device(regmap)));
244
-
s32 ret;
244
+
int ret;
245
245
246
246
if (data->powerstatus == MLX90632_PWR_STATUS_CONTINUOUS)
247
247
return 0;
···
252
252
return ret;
253
253
254
254
data->powerstatus = MLX90632_PWR_STATUS_CONTINUOUS;
255
-
return ret;
255
+
return 0;
256
256
}
257
257
258
258
/**
···
444
444
static int mlx90632_read_ambient_raw(struct regmap *regmap,
445
445
s16 *ambient_new_raw, s16 *ambient_old_raw)
446
446
{
447
-
int ret;
448
447
unsigned int read_tmp;
448
+
int ret;
449
449
450
450
ret = regmap_read(regmap, MLX90632_RAM_3(1), &read_tmp);
451
451
if (ret < 0)
···
464
464
int perform_measurement_ret,
465
465
s16 *object_new_raw, s16 *object_old_raw)
466
466
{
467
-
int ret;
468
467
unsigned int read_tmp;
469
-
s16 read;
470
-
u8 channel = 0;
471
468
u8 channel_old = 0;
469
+
u8 channel = 0;
470
+
s16 read;
471
+
int ret;
472
472
473
473
ret = mlx90632_channel_new_select(perform_measurement_ret, &channel,
474
474
&channel_old);
···
503
503
s16 *ambient_new_raw, s16 *ambient_old_raw,
504
504
s16 *object_new_raw, s16 *object_old_raw)
505
505
{
506
-
s32 ret, measurement;
506
+
s32 measurement;
507
+
int ret;
507
508
508
509
mutex_lock(&data->lock);
509
510
ret = mlx90632_set_meas_type(data, MLX90632_MTYP_MEDICAL);
···
513
512
514
513
switch (data->powerstatus) {
515
514
case MLX90632_PWR_STATUS_CONTINUOUS:
516
-
measurement = mlx90632_perform_measurement(data);
517
-
if (measurement < 0) {
518
-
ret = measurement;
515
+
ret = mlx90632_perform_measurement(data);
516
+
if (ret < 0)
519
517
goto read_unlock;
520
-
}
518
+
521
519
break;
522
520
case MLX90632_PWR_STATUS_SLEEP_STEP:
523
-
measurement = mlx90632_perform_measurement_burst(data);
524
-
if (measurement < 0) {
525
-
ret = measurement;
521
+
ret = mlx90632_perform_measurement_burst(data);
522
+
if (ret < 0)
526
523
goto read_unlock;
527
-
}
524
+
528
525
break;
529
526
default:
530
527
ret = -EOPNOTSUPP;
531
528
goto read_unlock;
532
529
}
530
+
531
+
measurement = ret; /* If we came here ret holds the measurement position */
533
532
534
533
ret = mlx90632_read_ambient_raw(data->regmap, ambient_new_raw,
535
534
ambient_old_raw);
···
616
615
if (ret < 0)
617
616
goto read_unlock;
618
617
619
-
if (data->powerstatus == MLX90632_PWR_STATUS_CONTINUOUS) {
618
+
switch (data->powerstatus) {
619
+
case MLX90632_PWR_STATUS_CONTINUOUS:
620
620
ret = read_poll_timeout(mlx90632_perform_measurement, meas, meas == 19,
621
621
50000, 800000, false, data);
622
622
if (ret)
623
623
goto read_unlock;
624
-
} else if (data->powerstatus == MLX90632_PWR_STATUS_SLEEP_STEP) {
624
+
break;
625
+
case MLX90632_PWR_STATUS_SLEEP_STEP:
625
626
ret = mlx90632_perform_measurement_burst(data);
626
627
if (ret < 0)
627
628
goto read_unlock;
629
+
break;
630
+
default:
631
+
ret = -EOPNOTSUPP;
632
+
goto read_unlock;
628
633
}
629
634
630
635
ret = mlx90632_read_object_raw_extended(data->regmap, object_new_raw);
···
647
640
static int mlx90632_read_ee_register(struct regmap *regmap, u16 reg_lsb,
648
641
s32 *reg_value)
649
642
{
650
-
s32 ret;
651
643
unsigned int read;
652
644
u32 value;
645
+
int ret;
653
646
654
647
ret = regmap_read(regmap, reg_lsb, &read);
655
648
if (ret < 0)
···
813
806
814
807
static int mlx90632_calc_object_dsp105(struct mlx90632_data *data, int *val)
815
808
{
816
-
s32 ret;
809
+
s16 ambient_new_raw, ambient_old_raw, object_new_raw, object_old_raw;
817
810
s32 Ea, Eb, Fa, Fb, Ga;
818
811
unsigned int read_tmp;
819
-
s16 Ha, Hb, Gb, Ka;
820
-
s16 ambient_new_raw, ambient_old_raw, object_new_raw, object_old_raw;
821
812
s64 object, ambient;
813
+
s16 Ha, Hb, Gb, Ka;
814
+
int ret;
822
815
823
816
ret = mlx90632_read_ee_register(data->regmap, MLX90632_EE_Ea, &Ea);
824
817
if (ret < 0)
···
892
885
893
886
static int mlx90632_calc_ambient_dsp105(struct mlx90632_data *data, int *val)
894
887
{
895
-
s32 ret;
888
+
s16 ambient_new_raw, ambient_old_raw;
896
889
unsigned int read_tmp;
897
890
s32 PT, PR, PG, PO;
891
+
int ret;
898
892
s16 Gb;
899
-
s16 ambient_new_raw, ambient_old_raw;
900
893
901
894
ret = mlx90632_read_ee_register(data->regmap, MLX90632_EE_P_R, &PR);
902
895
if (ret < 0)
···
1171
1164
static int mlx90632_probe(struct i2c_client *client,
1172
1165
const struct i2c_device_id *id)
1173
1166
{
1174
-
struct iio_dev *indio_dev;
1175
1167
struct mlx90632_data *mlx90632;
1168
+
struct iio_dev *indio_dev;
1176
1169
struct regmap *regmap;
1177
-
int ret;
1178
1170
unsigned int read;
1171
+
int ret;
1179
1172
1180
1173
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mlx90632));
1181
1174
if (!indio_dev) {