Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: health: afe4404: 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-4-afd@ti.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Andrew Davis
and committed by
Jonathan Cameron
7c1ece9b
a57d6b85
+22
-24
+22
-24
drivers/iio/health/afe4404.c
+22
-24
drivers/iio/health/afe4404.c
···
77
77
78
78
/**
79
79
* struct afe4404_data - AFE4404 device instance data
80
-
* @dev: Device structure
81
80
* @regmap: Register map of the device
82
81
* @fields: Register fields of the device
83
82
* @regulator: Pointer to the regulator for the IC
···
85
86
* @buffer: Used to construct a scan to push to the iio buffer.
86
87
*/
87
88
struct afe4404_data {
88
-
struct device *dev;
89
89
struct regmap *regmap;
90
90
struct regmap_field *fields[F_MAX_FIELDS];
91
91
struct regulator *regulator;
···
466
468
467
469
static int afe4404_probe(struct i2c_client *client)
468
470
{
471
+
struct device *dev = &client->dev;
469
472
struct iio_dev *indio_dev;
470
473
struct afe4404_data *afe;
471
474
int i, ret;
472
475
473
-
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*afe));
476
+
indio_dev = devm_iio_device_alloc(dev, sizeof(*afe));
474
477
if (!indio_dev)
475
478
return -ENOMEM;
476
479
477
480
afe = iio_priv(indio_dev);
478
481
i2c_set_clientdata(client, indio_dev);
479
482
480
-
afe->dev = &client->dev;
481
483
afe->irq = client->irq;
482
484
483
485
afe->regmap = devm_regmap_init_i2c(client, &afe4404_regmap_config);
484
486
if (IS_ERR(afe->regmap)) {
485
-
dev_err(afe->dev, "Unable to allocate register map\n");
487
+
dev_err(dev, "Unable to allocate register map\n");
486
488
return PTR_ERR(afe->regmap);
487
489
}
488
490
489
491
for (i = 0; i < F_MAX_FIELDS; i++) {
490
-
afe->fields[i] = devm_regmap_field_alloc(afe->dev, afe->regmap,
492
+
afe->fields[i] = devm_regmap_field_alloc(dev, afe->regmap,
491
493
afe4404_reg_fields[i]);
492
494
if (IS_ERR(afe->fields[i])) {
493
-
dev_err(afe->dev, "Unable to allocate regmap fields\n");
495
+
dev_err(dev, "Unable to allocate regmap fields\n");
494
496
return PTR_ERR(afe->fields[i]);
495
497
}
496
498
}
497
499
498
-
afe->regulator = devm_regulator_get(afe->dev, "tx_sup");
500
+
afe->regulator = devm_regulator_get(dev, "tx_sup");
499
501
if (IS_ERR(afe->regulator))
500
-
return dev_err_probe(afe->dev, PTR_ERR(afe->regulator),
502
+
return dev_err_probe(dev, PTR_ERR(afe->regulator),
501
503
"Unable to get regulator\n");
502
504
503
505
ret = regulator_enable(afe->regulator);
504
506
if (ret) {
505
-
dev_err(afe->dev, "Unable to enable regulator\n");
507
+
dev_err(dev, "Unable to enable regulator\n");
506
508
return ret;
507
509
}
508
-
ret = devm_add_action_or_reset(afe->dev, afe4404_regulator_disable, afe->regulator);
510
+
ret = devm_add_action_or_reset(dev, afe4404_regulator_disable, afe->regulator);
509
511
if (ret) {
510
-
dev_err(afe->dev, "Unable to enable regulator\n");
512
+
dev_err(dev, "Unable to enable regulator\n");
511
513
return ret;
512
514
}
513
515
514
516
ret = regmap_write(afe->regmap, AFE440X_CONTROL0,
515
517
AFE440X_CONTROL0_SW_RESET);
516
518
if (ret) {
517
-
dev_err(afe->dev, "Unable to reset device\n");
519
+
dev_err(dev, "Unable to reset device\n");
518
520
return ret;
519
521
}
520
522
521
523
ret = regmap_multi_reg_write(afe->regmap, afe4404_reg_sequences,
522
524
ARRAY_SIZE(afe4404_reg_sequences));
523
525
if (ret) {
524
-
dev_err(afe->dev, "Unable to set register defaults\n");
526
+
dev_err(dev, "Unable to set register defaults\n");
525
527
return ret;
526
528
}
527
529
···
532
534
indio_dev->info = &afe4404_iio_info;
533
535
534
536
if (afe->irq > 0) {
535
-
afe->trig = devm_iio_trigger_alloc(afe->dev,
537
+
afe->trig = devm_iio_trigger_alloc(dev,
536
538
"%s-dev%d",
537
539
indio_dev->name,
538
540
iio_device_id(indio_dev));
539
541
if (!afe->trig) {
540
-
dev_err(afe->dev, "Unable to allocate IIO trigger\n");
542
+
dev_err(dev, "Unable to allocate IIO trigger\n");
541
543
return -ENOMEM;
542
544
}
543
545
544
546
iio_trigger_set_drvdata(afe->trig, indio_dev);
545
547
546
-
ret = devm_iio_trigger_register(afe->dev, afe->trig);
548
+
ret = devm_iio_trigger_register(dev, afe->trig);
547
549
if (ret) {
548
-
dev_err(afe->dev, "Unable to register IIO trigger\n");
550
+
dev_err(dev, "Unable to register IIO trigger\n");
549
551
return ret;
550
552
}
551
553
552
-
ret = devm_request_threaded_irq(afe->dev, afe->irq,
554
+
ret = devm_request_threaded_irq(dev, afe->irq,
553
555
iio_trigger_generic_data_rdy_poll,
554
556
NULL, IRQF_ONESHOT,
555
557
AFE4404_DRIVER_NAME,
556
558
afe->trig);
557
559
if (ret) {
558
-
dev_err(afe->dev, "Unable to request IRQ\n");
560
+
dev_err(dev, "Unable to request IRQ\n");
559
561
return ret;
560
562
}
561
563
}
562
564
563
-
ret = devm_iio_triggered_buffer_setup(afe->dev, indio_dev,
565
+
ret = devm_iio_triggered_buffer_setup(dev, indio_dev,
564
566
&iio_pollfunc_store_time,
565
567
afe4404_trigger_handler, NULL);
566
568
if (ret) {
567
-
dev_err(afe->dev, "Unable to setup buffer\n");
569
+
dev_err(dev, "Unable to setup buffer\n");
568
570
return ret;
569
571
}
570
572
571
-
ret = devm_iio_device_register(afe->dev, indio_dev);
573
+
ret = devm_iio_device_register(dev, indio_dev);
572
574
if (ret) {
573
-
dev_err(afe->dev, "Unable to register IIO device\n");
575
+
dev_err(dev, "Unable to register IIO device\n");
574
576
return ret;
575
577
}
576
578