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: dac: adi-axi-dac: Make use of a local struct device variable

Use a local struct device variable to improve readability in some code
paths during probe. While at it, fix some line breaks not properly
aligned to the open parenthesis.

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 fe1846f6 d8011335

+23 -24
+23 -24
drivers/iio/dac/adi-axi-dac.c
··· 885 885 886 886 static int axi_dac_probe(struct platform_device *pdev) 887 887 { 888 + struct device *dev = &pdev->dev; 888 889 struct axi_dac_state *st; 889 890 void __iomem *base; 890 891 unsigned int ver; 891 892 struct clk *clk; 892 893 int ret; 893 894 894 - st = devm_kzalloc(&pdev->dev, sizeof(*st), GFP_KERNEL); 895 + st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL); 895 896 if (!st) 896 897 return -ENOMEM; 897 898 898 - st->info = device_get_match_data(&pdev->dev); 899 + st->info = device_get_match_data(dev); 899 900 if (!st->info) 900 901 return -ENODEV; 901 - clk = devm_clk_get_enabled(&pdev->dev, "s_axi_aclk"); 902 + clk = devm_clk_get_enabled(dev, "s_axi_aclk"); 902 903 if (IS_ERR(clk)) { 903 904 /* Backward compat., old fdt versions without clock-names. */ 904 - clk = devm_clk_get_enabled(&pdev->dev, NULL); 905 + clk = devm_clk_get_enabled(dev, NULL); 905 906 if (IS_ERR(clk)) 906 - return dev_err_probe(&pdev->dev, PTR_ERR(clk), 907 - "failed to get clock\n"); 907 + return dev_err_probe(dev, PTR_ERR(clk), 908 + "failed to get clock\n"); 908 909 } 909 910 910 911 if (st->info->has_dac_clk) { 911 912 struct clk *dac_clk; 912 913 913 - dac_clk = devm_clk_get_enabled(&pdev->dev, "dac_clk"); 914 + dac_clk = devm_clk_get_enabled(dev, "dac_clk"); 914 915 if (IS_ERR(dac_clk)) 915 - return dev_err_probe(&pdev->dev, PTR_ERR(dac_clk), 916 + return dev_err_probe(dev, PTR_ERR(dac_clk), 916 917 "failed to get dac_clk clock\n"); 917 918 918 919 /* We only care about the streaming mode rate */ ··· 924 923 if (IS_ERR(base)) 925 924 return PTR_ERR(base); 926 925 927 - st->dev = &pdev->dev; 928 - st->regmap = devm_regmap_init_mmio(&pdev->dev, base, 929 - &axi_dac_regmap_config); 926 + st->dev = dev; 927 + st->regmap = devm_regmap_init_mmio(dev, base, &axi_dac_regmap_config); 930 928 if (IS_ERR(st->regmap)) 931 - return dev_err_probe(&pdev->dev, PTR_ERR(st->regmap), 929 + return dev_err_probe(dev, PTR_ERR(st->regmap), 932 930 "failed to init register map\n"); 933 931 934 932 /* ··· 944 944 945 945 if (ADI_AXI_PCORE_VER_MAJOR(ver) != 946 946 ADI_AXI_PCORE_VER_MAJOR(st->info->version)) { 947 - dev_err(&pdev->dev, 947 + dev_err(dev, 948 948 "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n", 949 949 ADI_AXI_PCORE_VER_MAJOR(st->info->version), 950 950 ADI_AXI_PCORE_VER_MINOR(st->info->version), ··· 975 975 976 976 mutex_init(&st->lock); 977 977 978 - ret = devm_iio_backend_register(&pdev->dev, st->info->backend_info, st); 978 + ret = devm_iio_backend_register(dev, st->info->backend_info, st); 979 979 if (ret) 980 - return dev_err_probe(&pdev->dev, ret, 980 + return dev_err_probe(dev, ret, 981 981 "failed to register iio backend\n"); 982 982 983 - device_for_each_child_node_scoped(&pdev->dev, child) { 983 + device_for_each_child_node_scoped(dev, child) { 984 984 int val; 985 985 986 986 if (!st->info->has_child_nodes) 987 - return dev_err_probe(&pdev->dev, -EINVAL, 987 + return dev_err_probe(dev, -EINVAL, 988 988 "invalid fdt axi-dac compatible."); 989 989 990 990 /* Processing only reg 0 node */ 991 991 ret = fwnode_property_read_u32(child, "reg", &val); 992 992 if (ret) 993 - return dev_err_probe(&pdev->dev, ret, 994 - "invalid reg property."); 993 + return dev_err_probe(dev, ret, "invalid reg property."); 995 994 if (val != 0) 996 - return dev_err_probe(&pdev->dev, -EINVAL, 997 - "invalid node address."); 995 + return dev_err_probe(dev, -EINVAL, 996 + "invalid node address."); 998 997 999 998 ret = axi_dac_create_platform_device(st, child); 1000 999 if (ret) 1001 - return dev_err_probe(&pdev->dev, -EINVAL, 1002 - "cannot create device."); 1000 + return dev_err_probe(dev, -EINVAL, 1001 + "cannot create device."); 1003 1002 } 1004 1003 1005 - dev_info(&pdev->dev, "AXI DAC IP core (%d.%.2d.%c) probed\n", 1004 + dev_info(dev, "AXI DAC IP core (%d.%.2d.%c) probed\n", 1006 1005 ADI_AXI_PCORE_VER_MAJOR(ver), 1007 1006 ADI_AXI_PCORE_VER_MINOR(ver), 1008 1007 ADI_AXI_PCORE_VER_PATCH(ver));