Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: adc: aspeed: Simplify probe() with local 'dev' and 'np'
Simplify the probe function by using local 'dev' and 'np' variables
instead of full pointer dereferences. This makes several lines shorter,
which allows to avoid wrapping making code more readable. While
touching the return line, simplify by avoiding unnecessary 'ret'
assignment.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Krzysztof Kozlowski
and committed by
Jonathan Cameron
48de61f6
da1d3596
+19
-23
+19
-23
drivers/iio/adc/aspeed_adc.c
+19
-23
drivers/iio/adc/aspeed_adc.c
···
472
472
struct aspeed_adc_data *data;
473
473
int ret;
474
474
u32 adc_engine_control_reg_val;
475
+
struct device *dev = &pdev->dev;
476
+
struct device_node *np = dev_of_node(dev);
475
477
unsigned long scaler_flags = 0;
476
478
char clk_name[32], clk_parent_name[32];
477
479
478
-
indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*data));
480
+
indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
479
481
if (!indio_dev)
480
482
return -ENOMEM;
481
483
482
484
data = iio_priv(indio_dev);
483
-
data->dev = &pdev->dev;
484
-
data->model_data = of_device_get_match_data(&pdev->dev);
485
+
data->dev = dev;
486
+
data->model_data = of_device_get_match_data(dev);
485
487
platform_set_drvdata(pdev, indio_dev);
486
488
487
489
data->base = devm_platform_ioremap_resource(pdev, 0);
···
493
491
/* Register ADC clock prescaler with source specified by device tree. */
494
492
spin_lock_init(&data->clk_lock);
495
493
snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name), "%s",
496
-
of_clk_get_parent_name(pdev->dev.of_node, 0));
494
+
of_clk_get_parent_name(np, 0));
497
495
snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-fixed-div",
498
496
data->model_data->model_name);
499
-
data->fixed_div_clk = clk_hw_register_fixed_factor(
500
-
&pdev->dev, clk_name, clk_parent_name, 0, 1, 2);
497
+
data->fixed_div_clk = clk_hw_register_fixed_factor(dev, clk_name,
498
+
clk_parent_name, 0, 1, 2);
501
499
if (IS_ERR(data->fixed_div_clk))
502
500
return PTR_ERR(data->fixed_div_clk);
503
501
504
-
ret = devm_add_action_or_reset(data->dev,
505
-
aspeed_adc_unregister_fixed_divider,
502
+
ret = devm_add_action_or_reset(dev, aspeed_adc_unregister_fixed_divider,
506
503
data->fixed_div_clk);
507
504
if (ret)
508
505
return ret;
···
511
510
snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-prescaler",
512
511
data->model_data->model_name);
513
512
data->clk_prescaler = devm_clk_hw_register_divider(
514
-
&pdev->dev, clk_name, clk_parent_name, 0,
513
+
dev, clk_name, clk_parent_name, 0,
515
514
data->base + ASPEED_REG_CLOCK_CONTROL, 17, 15, 0,
516
515
&data->clk_lock);
517
516
if (IS_ERR(data->clk_prescaler))
···
527
526
snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-scaler",
528
527
data->model_data->model_name);
529
528
data->clk_scaler = devm_clk_hw_register_divider(
530
-
&pdev->dev, clk_name, clk_parent_name, scaler_flags,
529
+
dev, clk_name, clk_parent_name, scaler_flags,
531
530
data->base + ASPEED_REG_CLOCK_CONTROL, 0,
532
531
data->model_data->scaler_bit_width,
533
532
data->model_data->need_prescaler ? CLK_DIVIDER_ONE_BASED : 0,
···
535
534
if (IS_ERR(data->clk_scaler))
536
535
return PTR_ERR(data->clk_scaler);
537
536
538
-
data->rst = devm_reset_control_get_shared(&pdev->dev, NULL);
537
+
data->rst = devm_reset_control_get_shared(dev, NULL);
539
538
if (IS_ERR(data->rst))
540
-
return dev_err_probe(&pdev->dev, PTR_ERR(data->rst),
539
+
return dev_err_probe(dev, PTR_ERR(data->rst),
541
540
"invalid or missing reset controller device tree entry");
542
541
543
542
reset_control_deassert(data->rst);
544
543
545
-
ret = devm_add_action_or_reset(data->dev, aspeed_adc_reset_assert,
546
-
data->rst);
544
+
ret = devm_add_action_or_reset(dev, aspeed_adc_reset_assert, data->rst);
547
545
if (ret)
548
546
return ret;
549
547
···
554
554
if (ret)
555
555
return ret;
556
556
557
-
if (of_property_present(data->dev->of_node, "aspeed,battery-sensing")) {
557
+
if (of_property_present(np, "aspeed,battery-sensing")) {
558
558
if (data->model_data->bat_sense_sup) {
559
559
data->battery_sensing = 1;
560
560
if (readl(data->base + ASPEED_REG_ENGINE_CONTROL) &
···
566
566
data->battery_mode_gain.div = 2;
567
567
}
568
568
} else
569
-
dev_warn(&pdev->dev,
570
-
"Failed to enable battery-sensing mode\n");
569
+
dev_warn(dev, "Failed to enable battery-sensing mode\n");
571
570
}
572
571
573
572
ret = clk_prepare_enable(data->clk_scaler->clk);
574
573
if (ret)
575
574
return ret;
576
-
ret = devm_add_action_or_reset(data->dev,
577
-
aspeed_adc_clk_disable_unprepare,
575
+
ret = devm_add_action_or_reset(dev, aspeed_adc_clk_disable_unprepare,
578
576
data->clk_scaler->clk);
579
577
if (ret)
580
578
return ret;
···
590
592
writel(adc_engine_control_reg_val,
591
593
data->base + ASPEED_REG_ENGINE_CONTROL);
592
594
593
-
ret = devm_add_action_or_reset(data->dev, aspeed_adc_power_down,
594
-
data);
595
+
ret = devm_add_action_or_reset(dev, aspeed_adc_power_down, data);
595
596
if (ret)
596
597
return ret;
597
598
···
622
625
aspeed_adc_iio_channels;
623
626
indio_dev->num_channels = data->model_data->num_channels;
624
627
625
-
ret = devm_iio_device_register(data->dev, indio_dev);
626
-
return ret;
628
+
return devm_iio_device_register(dev, indio_dev);
627
629
}
628
630
629
631
static const struct aspeed_adc_trim_locate ast2500_adc_trim = {