Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: frequency: admv1013: add dev variable
Introduce a local struct device pointer in functions that reference
&spi->dev for device-managed resource calls and device property reads,
improving code readability.
Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Antoniu Miclaus
and committed by
Jonathan Cameron
e61b5bb0
b343f010
+15
-14
+15
-14
drivers/iio/frequency/admv1013.c
+15
-14
drivers/iio/frequency/admv1013.c
···
518
518
{
519
519
int ret;
520
520
const char *str;
521
-
struct spi_device *spi = st->spi;
521
+
struct device *dev = &st->spi->dev;
522
522
523
-
st->det_en = device_property_read_bool(&spi->dev, "adi,detector-enable");
523
+
st->det_en = device_property_read_bool(dev, "adi,detector-enable");
524
524
525
-
ret = device_property_read_string(&spi->dev, "adi,input-mode", &str);
525
+
ret = device_property_read_string(dev, "adi,input-mode", &str);
526
526
if (ret)
527
527
st->input_mode = ADMV1013_IQ_MODE;
528
528
···
533
533
else
534
534
return -EINVAL;
535
535
536
-
ret = device_property_read_string(&spi->dev, "adi,quad-se-mode", &str);
536
+
ret = device_property_read_string(dev, "adi,quad-se-mode", &str);
537
537
if (ret)
538
538
st->quad_se_mode = ADMV1013_SE_MODE_DIFF;
539
539
···
546
546
else
547
547
return -EINVAL;
548
548
549
-
ret = devm_regulator_bulk_get_enable(&st->spi->dev,
549
+
ret = devm_regulator_bulk_get_enable(dev,
550
550
ARRAY_SIZE(admv1013_vcc_regs),
551
551
admv1013_vcc_regs);
552
552
if (ret) {
553
-
dev_err_probe(&spi->dev, ret,
553
+
dev_err_probe(dev, ret,
554
554
"Failed to request VCC regulators\n");
555
555
return ret;
556
556
}
···
562
562
{
563
563
struct iio_dev *indio_dev;
564
564
struct admv1013_state *st;
565
+
struct device *dev = &spi->dev;
565
566
int ret, vcm_uv;
566
567
567
-
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
568
+
indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
568
569
if (!indio_dev)
569
570
return -ENOMEM;
570
571
···
582
581
if (ret)
583
582
return ret;
584
583
585
-
ret = devm_regulator_get_enable_read_voltage(&spi->dev, "vcm");
584
+
ret = devm_regulator_get_enable_read_voltage(dev, "vcm");
586
585
if (ret < 0)
587
-
return dev_err_probe(&spi->dev, ret,
586
+
return dev_err_probe(dev, ret,
588
587
"failed to get the common-mode voltage\n");
589
588
590
589
vcm_uv = ret;
591
590
592
-
st->clkin = devm_clk_get_enabled(&spi->dev, "lo_in");
591
+
st->clkin = devm_clk_get_enabled(dev, "lo_in");
593
592
if (IS_ERR(st->clkin))
594
-
return dev_err_probe(&spi->dev, PTR_ERR(st->clkin),
593
+
return dev_err_probe(dev, PTR_ERR(st->clkin),
595
594
"failed to get the LO input clock\n");
596
595
597
596
st->nb.notifier_call = admv1013_freq_change;
598
-
ret = devm_clk_notifier_register(&spi->dev, st->clkin, &st->nb);
597
+
ret = devm_clk_notifier_register(dev, st->clkin, &st->nb);
599
598
if (ret)
600
599
return ret;
601
600
···
607
606
return ret;
608
607
}
609
608
610
-
ret = devm_add_action_or_reset(&spi->dev, admv1013_powerdown, st);
609
+
ret = devm_add_action_or_reset(dev, admv1013_powerdown, st);
611
610
if (ret)
612
611
return ret;
613
612
614
-
return devm_iio_device_register(&spi->dev, indio_dev);
613
+
return devm_iio_device_register(dev, indio_dev);
615
614
}
616
615
617
616
static const struct spi_device_id admv1013_id[] = {