Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: adc: mcp3911: simplify usage of spi->dev
Replace the usage of `adc->spi->dev` with `dev` to make the code prettier.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Link: https://lore.kernel.org/r/20230822192259.1125792-4-marcus.folkesson@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Marcus Folkesson
and committed by
Jonathan Cameron
d1f6a2ac
46d1bfa0
+23
-27
+23
-27
drivers/iio/adc/mcp3911.c
+23
-27
drivers/iio/adc/mcp3911.c
···
269
269
270
270
static int mcp3911_calc_scale_table(struct mcp3911 *adc)
271
271
{
272
+
struct device *dev = &adc->spi->dev;
272
273
u32 ref = MCP3911_INT_VREF_MV;
273
274
u32 div;
274
275
int ret;
···
278
277
if (adc->vref) {
279
278
ret = regulator_get_voltage(adc->vref);
280
279
if (ret < 0) {
281
-
return dev_err_probe(&adc->spi->dev, ret, "failed to get vref voltage\n");
280
+
return dev_err_probe(dev, ret, "failed to get vref voltage\n");
282
281
}
283
282
284
283
ref = ret / 1000;
···
335
334
struct iio_poll_func *pf = p;
336
335
struct iio_dev *indio_dev = pf->indio_dev;
337
336
struct mcp3911 *adc = iio_priv(indio_dev);
337
+
struct device *dev = &adc->spi->dev;
338
338
struct spi_transfer xfer[] = {
339
339
{
340
340
.tx_buf = &adc->tx_buf,
···
353
351
adc->tx_buf = MCP3911_REG_READ(MCP3911_CHANNEL(0), adc->dev_addr);
354
352
ret = spi_sync_transfer(adc->spi, xfer, ARRAY_SIZE(xfer));
355
353
if (ret < 0) {
356
-
dev_warn(&adc->spi->dev,
357
-
"failed to get conversion data\n");
354
+
dev_warn(dev, "failed to get conversion data\n");
358
355
goto out;
359
356
}
360
357
···
398
397
"invalid device address (%i). Must be in range 0-3.\n",
399
398
adc->dev_addr);
400
399
}
401
-
dev_dbg(&adc->spi->dev, "use device address %i\n", adc->dev_addr);
400
+
dev_dbg(dev, "use device address %i\n", adc->dev_addr);
402
401
403
402
ret = mcp3911_read(adc, MCP3911_REG_CONFIG, ®val, 2);
404
403
if (ret)
···
406
405
407
406
regval &= ~MCP3911_CONFIG_VREFEXT;
408
407
if (adc->vref) {
409
-
dev_dbg(&adc->spi->dev, "use external voltage reference\n");
408
+
dev_dbg(dev, "use external voltage reference\n");
410
409
regval |= FIELD_PREP(MCP3911_CONFIG_VREFEXT, 1);
411
410
} else {
412
-
dev_dbg(&adc->spi->dev,
413
-
"use internal voltage reference (1.2V)\n");
411
+
dev_dbg(dev, "use internal voltage reference (1.2V)\n");
414
412
regval |= FIELD_PREP(MCP3911_CONFIG_VREFEXT, 0);
415
413
}
416
414
417
415
regval &= ~MCP3911_CONFIG_CLKEXT;
418
416
if (adc->clki) {
419
-
dev_dbg(&adc->spi->dev, "use external clock as clocksource\n");
417
+
dev_dbg(dev, "use external clock as clocksource\n");
420
418
regval |= FIELD_PREP(MCP3911_CONFIG_CLKEXT, 1);
421
419
} else {
422
-
dev_dbg(&adc->spi->dev,
423
-
"use crystal oscillator as clocksource\n");
420
+
dev_dbg(dev, "use crystal oscillator as clocksource\n");
424
421
regval |= FIELD_PREP(MCP3911_CONFIG_CLKEXT, 0);
425
422
}
426
423
···
466
467
struct mcp3911 *adc;
467
468
int ret;
468
469
469
-
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adc));
470
+
indio_dev = devm_iio_device_alloc(dev, sizeof(*adc));
470
471
if (!indio_dev)
471
472
return -ENOMEM;
472
473
473
474
adc = iio_priv(indio_dev);
474
475
adc->spi = spi;
475
476
476
-
adc->vref = devm_regulator_get_optional(&adc->spi->dev, "vref");
477
+
adc->vref = devm_regulator_get_optional(dev, "vref");
477
478
if (IS_ERR(adc->vref)) {
478
479
if (PTR_ERR(adc->vref) == -ENODEV) {
479
480
adc->vref = NULL;
···
486
487
if (ret)
487
488
return ret;
488
489
489
-
ret = devm_add_action_or_reset(&spi->dev,
490
-
mcp3911_cleanup_regulator, adc->vref);
490
+
ret = devm_add_action_or_reset(dev, mcp3911_cleanup_regulator, adc->vref);
491
491
if (ret)
492
492
return ret;
493
493
}
494
494
495
-
adc->clki = devm_clk_get_enabled(&adc->spi->dev, NULL);
495
+
adc->clki = devm_clk_get_enabled(dev, NULL);
496
496
if (IS_ERR(adc->clki)) {
497
497
if (PTR_ERR(adc->clki) == -ENOENT) {
498
498
adc->clki = NULL;
···
504
506
if (ret)
505
507
return ret;
506
508
507
-
if (device_property_read_bool(&adc->spi->dev, "microchip,data-ready-hiz"))
509
+
if (device_property_read_bool(dev, "microchip,data-ready-hiz"))
508
510
ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ,
509
511
0, 2);
510
512
else
···
538
540
mutex_init(&adc->lock);
539
541
540
542
if (spi->irq > 0) {
541
-
adc->trig = devm_iio_trigger_alloc(&spi->dev, "%s-dev%d",
542
-
indio_dev->name,
543
-
iio_device_id(indio_dev));
543
+
adc->trig = devm_iio_trigger_alloc(dev, "%s-dev%d", indio_dev->name,
544
+
iio_device_id(indio_dev));
544
545
if (!adc->trig)
545
546
return -ENOMEM;
546
547
547
548
adc->trig->ops = &mcp3911_trigger_ops;
548
549
iio_trigger_set_drvdata(adc->trig, adc);
549
-
ret = devm_iio_trigger_register(&spi->dev, adc->trig);
550
+
ret = devm_iio_trigger_register(dev, adc->trig);
550
551
if (ret)
551
552
return ret;
552
553
···
554
557
* Some platforms might not allow the option to power it down so
555
558
* don't enable the interrupt to avoid extra load on the system.
556
559
*/
557
-
ret = devm_request_irq(&spi->dev, spi->irq,
558
-
&iio_trigger_generic_data_rdy_poll, IRQF_NO_AUTOEN | IRQF_ONESHOT,
559
-
indio_dev->name, adc->trig);
560
+
ret = devm_request_irq(dev, spi->irq, &iio_trigger_generic_data_rdy_poll,
561
+
IRQF_NO_AUTOEN | IRQF_ONESHOT,
562
+
indio_dev->name, adc->trig);
560
563
if (ret)
561
564
return ret;
562
565
}
563
566
564
-
ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev,
565
-
NULL,
566
-
mcp3911_trigger_handler, NULL);
567
+
ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
568
+
mcp3911_trigger_handler, NULL);
567
569
if (ret)
568
570
return ret;
569
571
570
-
return devm_iio_device_register(&adc->spi->dev, indio_dev);
572
+
return devm_iio_device_register(dev, indio_dev);
571
573
}
572
574
573
575
static const struct of_device_id mcp3911_dt_ids[] = {