tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: adc: adi-axi-adc: Make use of dev_err_probe()

Be consistent and use dev_err_probe() as in all other places in the
.probe() path.

While at it, remove the line break in the version condition. Yes, it
goes over the 80 column limit but I do think the line break hurts
readability in this case. And use a struct device *dev helper for
neater code.

Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Nuno Sá and committed by
Jonathan Cameron 634a6316 47d323ce

+25 -30
+25 -30
drivers/iio/adc/adi-axi-adc.c
··· 674 674 675 675 static int adi_axi_adc_probe(struct platform_device *pdev) 676 676 { 677 + struct device *dev = &pdev->dev; 677 678 struct adi_axi_adc_state *st; 678 679 void __iomem *base; 679 680 unsigned int ver; 680 681 struct clk *clk; 681 682 int ret; 682 683 683 - st = devm_kzalloc(&pdev->dev, sizeof(*st), GFP_KERNEL); 684 + st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL); 684 685 if (!st) 685 686 return -ENOMEM; 686 687 ··· 689 688 if (IS_ERR(base)) 690 689 return PTR_ERR(base); 691 690 692 - st->dev = &pdev->dev; 693 - st->regmap = devm_regmap_init_mmio(&pdev->dev, base, 694 - &axi_adc_regmap_config); 691 + st->dev = dev; 692 + st->regmap = devm_regmap_init_mmio(dev, base, &axi_adc_regmap_config); 695 693 if (IS_ERR(st->regmap)) 696 - return dev_err_probe(&pdev->dev, PTR_ERR(st->regmap), 694 + return dev_err_probe(dev, PTR_ERR(st->regmap), 697 695 "failed to init register map\n"); 698 696 699 - st->info = device_get_match_data(&pdev->dev); 697 + st->info = device_get_match_data(dev); 700 698 if (!st->info) 701 699 return -ENODEV; 702 700 703 - clk = devm_clk_get_enabled(&pdev->dev, NULL); 701 + clk = devm_clk_get_enabled(dev, NULL); 704 702 if (IS_ERR(clk)) 705 - return dev_err_probe(&pdev->dev, PTR_ERR(clk), 703 + return dev_err_probe(dev, PTR_ERR(clk), 706 704 "failed to get clock\n"); 707 705 708 706 /* ··· 716 716 if (ret) 717 717 return ret; 718 718 719 - if (ADI_AXI_PCORE_VER_MAJOR(ver) != 720 - ADI_AXI_PCORE_VER_MAJOR(st->info->version)) { 721 - dev_err(&pdev->dev, 722 - "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", 723 - ADI_AXI_PCORE_VER_MAJOR(st->info->version), 724 - ADI_AXI_PCORE_VER_MINOR(st->info->version), 725 - ADI_AXI_PCORE_VER_PATCH(st->info->version), 726 - ADI_AXI_PCORE_VER_MAJOR(ver), 727 - ADI_AXI_PCORE_VER_MINOR(ver), 728 - ADI_AXI_PCORE_VER_PATCH(ver)); 729 - return -ENODEV; 730 - } 719 + if (ADI_AXI_PCORE_VER_MAJOR(ver) != ADI_AXI_PCORE_VER_MAJOR(st->info->version)) 720 + return dev_err_probe(dev, -ENODEV, 721 + "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", 722 + ADI_AXI_PCORE_VER_MAJOR(st->info->version), 723 + ADI_AXI_PCORE_VER_MINOR(st->info->version), 724 + ADI_AXI_PCORE_VER_PATCH(st->info->version), 725 + ADI_AXI_PCORE_VER_MAJOR(ver), 726 + ADI_AXI_PCORE_VER_MINOR(ver), 727 + ADI_AXI_PCORE_VER_PATCH(ver)); 731 728 732 - ret = devm_iio_backend_register(&pdev->dev, st->info->backend_info, st); 729 + ret = devm_iio_backend_register(dev, st->info->backend_info, st); 733 730 if (ret) 734 - return dev_err_probe(&pdev->dev, ret, 735 - "failed to register iio backend\n"); 731 + return dev_err_probe(dev, ret, "failed to register iio backend\n"); 736 732 737 - device_for_each_child_node_scoped(&pdev->dev, child) { 733 + device_for_each_child_node_scoped(dev, child) { 738 734 int val; 739 735 740 736 if (!st->info->has_child_nodes) 741 - return dev_err_probe(&pdev->dev, -EINVAL, 737 + return dev_err_probe(dev, -EINVAL, 742 738 "invalid fdt axi-dac compatible."); 743 739 744 740 /* Processing only reg 0 node */ 745 741 ret = fwnode_property_read_u32(child, "reg", &val); 746 742 if (ret) 747 - return dev_err_probe(&pdev->dev, ret, 748 - "invalid reg property."); 743 + return dev_err_probe(dev, ret, "invalid reg property."); 749 744 if (val != 0) 750 - return dev_err_probe(&pdev->dev, -EINVAL, 745 + return dev_err_probe(dev, -EINVAL, 751 746 "invalid node address."); 752 747 753 748 ret = axi_adc_create_platform_device(st, child); 754 749 if (ret) 755 - return dev_err_probe(&pdev->dev, -EINVAL, 750 + return dev_err_probe(dev, -EINVAL, 756 751 "cannot create device."); 757 752 } 758 753 759 - dev_info(&pdev->dev, "AXI ADC IP core (%d.%.2d.%c) probed\n", 754 + dev_info(dev, "AXI ADC IP core (%d.%.2d.%c) probed\n", 760 755 ADI_AXI_PCORE_VER_MAJOR(ver), 761 756 ADI_AXI_PCORE_VER_MINOR(ver), 762 757 ADI_AXI_PCORE_VER_PATCH(ver));