Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: health: afe4403: Do not store dev pointer in device struct
The device *dev is only used in probe(), so no need to store it
in the device local data struct. In all the places in probe()
we did use that, just use a new local variable for the same.
Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://patch.msgid.link/20250813225840.576305-1-afd@ti.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Andrew Davis
and committed by
Jonathan Cameron
a57d6b85
2c748d27
+22
-24
+22
-24
drivers/iio/health/afe4403.c
+22
-24
drivers/iio/health/afe4403.c
···
58
58
59
59
/**
60
60
* struct afe4403_data - AFE4403 device instance data
61
-
* @dev: Device structure
62
61
* @spi: SPI device handle
63
62
* @regmap: Register map of the device
64
63
* @fields: Register fields of the device
···
67
68
* @buffer: Used to construct data layout to push into IIO buffer.
68
69
*/
69
70
struct afe4403_data {
70
-
struct device *dev;
71
71
struct spi_device *spi;
72
72
struct regmap *regmap;
73
73
struct regmap_field *fields[F_MAX_FIELDS];
···
458
460
459
461
static int afe4403_probe(struct spi_device *spi)
460
462
{
463
+
struct device *dev = &spi->dev;
461
464
struct iio_dev *indio_dev;
462
465
struct afe4403_data *afe;
463
466
int i, ret;
464
467
465
-
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*afe));
468
+
indio_dev = devm_iio_device_alloc(dev, sizeof(*afe));
466
469
if (!indio_dev)
467
470
return -ENOMEM;
468
471
469
472
afe = iio_priv(indio_dev);
470
473
spi_set_drvdata(spi, indio_dev);
471
474
472
-
afe->dev = &spi->dev;
473
475
afe->spi = spi;
474
476
afe->irq = spi->irq;
475
477
476
478
afe->regmap = devm_regmap_init_spi(spi, &afe4403_regmap_config);
477
479
if (IS_ERR(afe->regmap)) {
478
-
dev_err(afe->dev, "Unable to allocate register map\n");
480
+
dev_err(dev, "Unable to allocate register map\n");
479
481
return PTR_ERR(afe->regmap);
480
482
}
481
483
482
484
for (i = 0; i < F_MAX_FIELDS; i++) {
483
-
afe->fields[i] = devm_regmap_field_alloc(afe->dev, afe->regmap,
485
+
afe->fields[i] = devm_regmap_field_alloc(dev, afe->regmap,
484
486
afe4403_reg_fields[i]);
485
487
if (IS_ERR(afe->fields[i])) {
486
-
dev_err(afe->dev, "Unable to allocate regmap fields\n");
488
+
dev_err(dev, "Unable to allocate regmap fields\n");
487
489
return PTR_ERR(afe->fields[i]);
488
490
}
489
491
}
490
492
491
-
afe->regulator = devm_regulator_get(afe->dev, "tx_sup");
493
+
afe->regulator = devm_regulator_get(dev, "tx_sup");
492
494
if (IS_ERR(afe->regulator))
493
-
return dev_err_probe(afe->dev, PTR_ERR(afe->regulator),
495
+
return dev_err_probe(dev, PTR_ERR(afe->regulator),
494
496
"Unable to get regulator\n");
495
497
496
498
ret = regulator_enable(afe->regulator);
497
499
if (ret) {
498
-
dev_err(afe->dev, "Unable to enable regulator\n");
500
+
dev_err(dev, "Unable to enable regulator\n");
499
501
return ret;
500
502
}
501
-
ret = devm_add_action_or_reset(afe->dev, afe4403_regulator_disable, afe->regulator);
503
+
ret = devm_add_action_or_reset(dev, afe4403_regulator_disable, afe->regulator);
502
504
if (ret) {
503
-
dev_err(afe->dev, "Unable to add regulator disable action\n");
505
+
dev_err(dev, "Unable to add regulator disable action\n");
504
506
return ret;
505
507
}
506
508
507
509
ret = regmap_write(afe->regmap, AFE440X_CONTROL0,
508
510
AFE440X_CONTROL0_SW_RESET);
509
511
if (ret) {
510
-
dev_err(afe->dev, "Unable to reset device\n");
512
+
dev_err(dev, "Unable to reset device\n");
511
513
return ret;
512
514
}
513
515
514
516
ret = regmap_multi_reg_write(afe->regmap, afe4403_reg_sequences,
515
517
ARRAY_SIZE(afe4403_reg_sequences));
516
518
if (ret) {
517
-
dev_err(afe->dev, "Unable to set register defaults\n");
519
+
dev_err(dev, "Unable to set register defaults\n");
518
520
return ret;
519
521
}
520
522
···
525
527
indio_dev->info = &afe4403_iio_info;
526
528
527
529
if (afe->irq > 0) {
528
-
afe->trig = devm_iio_trigger_alloc(afe->dev,
530
+
afe->trig = devm_iio_trigger_alloc(dev,
529
531
"%s-dev%d",
530
532
indio_dev->name,
531
533
iio_device_id(indio_dev));
532
534
if (!afe->trig) {
533
-
dev_err(afe->dev, "Unable to allocate IIO trigger\n");
535
+
dev_err(dev, "Unable to allocate IIO trigger\n");
534
536
return -ENOMEM;
535
537
}
536
538
537
539
iio_trigger_set_drvdata(afe->trig, indio_dev);
538
540
539
-
ret = devm_iio_trigger_register(afe->dev, afe->trig);
541
+
ret = devm_iio_trigger_register(dev, afe->trig);
540
542
if (ret) {
541
-
dev_err(afe->dev, "Unable to register IIO trigger\n");
543
+
dev_err(dev, "Unable to register IIO trigger\n");
542
544
return ret;
543
545
}
544
546
545
-
ret = devm_request_threaded_irq(afe->dev, afe->irq,
547
+
ret = devm_request_threaded_irq(dev, afe->irq,
546
548
iio_trigger_generic_data_rdy_poll,
547
549
NULL, IRQF_ONESHOT,
548
550
AFE4403_DRIVER_NAME,
549
551
afe->trig);
550
552
if (ret) {
551
-
dev_err(afe->dev, "Unable to request IRQ\n");
553
+
dev_err(dev, "Unable to request IRQ\n");
552
554
return ret;
553
555
}
554
556
}
555
557
556
-
ret = devm_iio_triggered_buffer_setup(afe->dev, indio_dev,
558
+
ret = devm_iio_triggered_buffer_setup(dev, indio_dev,
557
559
&iio_pollfunc_store_time,
558
560
afe4403_trigger_handler, NULL);
559
561
if (ret) {
560
-
dev_err(afe->dev, "Unable to setup buffer\n");
562
+
dev_err(dev, "Unable to setup buffer\n");
561
563
return ret;
562
564
}
563
565
564
-
ret = devm_iio_device_register(afe->dev, indio_dev);
566
+
ret = devm_iio_device_register(dev, indio_dev);
565
567
if (ret) {
566
-
dev_err(afe->dev, "Unable to register IIO device\n");
568
+
dev_err(dev, "Unable to register IIO device\n");
567
569
return ret;
568
570
}
569
571