Skip to content

Commit fd1d1d5

Browse files
justephnunojsa
authored andcommitted
iio: adc: ad7380: use local dev variable to shorten long lines
Use local dev variable in the probe function to shorten long lines. Signed-off-by: Julien Stephan <jstephan@baylibre.com> Reviewed-by: David Lechner <dlechner@baylibre.com> Link: https://patch.msgid.link/20241030-ad7380-add-adaq4380-4-support-v4-3-864ff02babae@baylibre.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent ef92dc8 commit fd1d1d5

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

drivers/iio/adc/ad7380.c

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,34 +1035,34 @@ static int ad7380_init(struct ad7380_state *st, bool external_ref_en)
10351035

10361036
static int ad7380_probe(struct spi_device *spi)
10371037
{
1038+
struct device *dev = &spi->dev;
10381039
struct iio_dev *indio_dev;
10391040
struct ad7380_state *st;
10401041
bool external_ref_en;
10411042
int ret, i;
10421043

1043-
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
1044+
indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
10441045
if (!indio_dev)
10451046
return -ENOMEM;
10461047

10471048
st = iio_priv(indio_dev);
10481049
st->spi = spi;
10491050
st->chip_info = spi_get_device_match_data(spi);
10501051
if (!st->chip_info)
1051-
return dev_err_probe(&spi->dev, -EINVAL, "missing match data\n");
1052+
return dev_err_probe(dev, -EINVAL, "missing match data\n");
10521053

1053-
ret = devm_regulator_bulk_get_enable(&spi->dev, st->chip_info->num_supplies,
1054+
ret = devm_regulator_bulk_get_enable(dev, st->chip_info->num_supplies,
10541055
st->chip_info->supplies);
10551056

10561057
if (ret)
1057-
return dev_err_probe(&spi->dev, ret,
1058+
return dev_err_probe(dev, ret,
10581059
"Failed to enable power supplies\n");
10591060
fsleep(T_POWERUP_US);
10601061

10611062
if (st->chip_info->external_ref_only) {
1062-
ret = devm_regulator_get_enable_read_voltage(&spi->dev,
1063-
"refin");
1063+
ret = devm_regulator_get_enable_read_voltage(dev, "refin");
10641064
if (ret < 0)
1065-
return dev_err_probe(&spi->dev, ret,
1065+
return dev_err_probe(dev, ret,
10661066
"Failed to get refin regulator\n");
10671067

10681068
st->vref_mv = ret / 1000;
@@ -1074,18 +1074,17 @@ static int ad7380_probe(struct spi_device *spi)
10741074
* If there is no REFIO supply, then it means that we are using
10751075
* the internal reference, otherwise REFIO is reference voltage.
10761076
*/
1077-
ret = devm_regulator_get_enable_read_voltage(&spi->dev,
1078-
"refio");
1077+
ret = devm_regulator_get_enable_read_voltage(dev, "refio");
10791078
if (ret < 0 && ret != -ENODEV)
1080-
return dev_err_probe(&spi->dev, ret,
1079+
return dev_err_probe(dev, ret,
10811080
"Failed to get refio regulator\n");
10821081

10831082
external_ref_en = ret != -ENODEV;
10841083
st->vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV;
10851084
}
10861085

10871086
if (st->chip_info->num_vcm_supplies > ARRAY_SIZE(st->vcm_mv))
1088-
return dev_err_probe(&spi->dev, -EINVAL,
1087+
return dev_err_probe(dev, -EINVAL,
10891088
"invalid number of VCM supplies\n");
10901089

10911090
/*
@@ -1095,18 +1094,18 @@ static int ad7380_probe(struct spi_device *spi)
10951094
for (i = 0; i < st->chip_info->num_vcm_supplies; i++) {
10961095
const char *vcm = st->chip_info->vcm_supplies[i];
10971096

1098-
ret = devm_regulator_get_enable_read_voltage(&spi->dev, vcm);
1097+
ret = devm_regulator_get_enable_read_voltage(dev, vcm);
10991098
if (ret < 0)
1100-
return dev_err_probe(&spi->dev, ret,
1099+
return dev_err_probe(dev, ret,
11011100
"Failed to get %s regulator\n",
11021101
vcm);
11031102

11041103
st->vcm_mv[i] = ret / 1000;
11051104
}
11061105

1107-
st->regmap = devm_regmap_init(&spi->dev, NULL, st, &ad7380_regmap_config);
1106+
st->regmap = devm_regmap_init(dev, NULL, st, &ad7380_regmap_config);
11081107
if (IS_ERR(st->regmap))
1109-
return dev_err_probe(&spi->dev, PTR_ERR(st->regmap),
1108+
return dev_err_probe(dev, PTR_ERR(st->regmap),
11101109
"failed to allocate register map\n");
11111110

11121111
/*
@@ -1157,7 +1156,7 @@ static int ad7380_probe(struct spi_device *spi)
11571156
indio_dev->modes = INDIO_DIRECT_MODE;
11581157
indio_dev->available_scan_masks = st->chip_info->available_scan_masks;
11591158

1160-
ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev,
1159+
ret = devm_iio_triggered_buffer_setup(dev, indio_dev,
11611160
iio_pollfunc_store_time,
11621161
ad7380_trigger_handler,
11631162
&ad7380_buffer_setup_ops);
@@ -1168,7 +1167,7 @@ static int ad7380_probe(struct spi_device *spi)
11681167
if (ret)
11691168
return ret;
11701169

1171-
return devm_iio_device_register(&spi->dev, indio_dev);
1170+
return devm_iio_device_register(dev, indio_dev);
11721171
}
11731172

11741173
static const struct of_device_id ad7380_of_match_table[] = {

0 commit comments

Comments
 (0)