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

iio: adc: ad7124: Use devm_ managed calls for all of probe() + drop remove()

As not many steps were not already devm_ managed, use
devm_add_action_or_reset() to handle the rest.

This also uses the new devm_ad_sd_setup_buffer_and_trigger() function.

Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210513120752.90074-12-aardelean@deviqon.com

+15 -33
+15 -33
drivers/iio/adc/ad7124.c
··· 862 862 regulator_disable(r); 863 863 } 864 864 865 + static void ad7124_clk_disable(void *c) 866 + { 867 + clk_disable_unprepare(c); 868 + } 869 + 865 870 static int ad7124_probe(struct spi_device *spi) 866 871 { 867 872 const struct ad7124_chip_info *info; ··· 887 882 st->chip_info = info; 888 883 889 884 ad_sd_init(&st->sd, indio_dev, spi, &ad7124_sigma_delta_info); 890 - 891 - spi_set_drvdata(spi, indio_dev); 892 885 893 886 indio_dev->name = st->chip_info->name; 894 887 indio_dev->modes = INDIO_DIRECT_MODE; ··· 925 922 if (ret < 0) 926 923 return ret; 927 924 925 + ret = devm_add_action_or_reset(&spi->dev, ad7124_clk_disable, st->mclk); 926 + if (ret) 927 + return ret; 928 + 928 929 ret = ad7124_soft_reset(st); 929 930 if (ret < 0) 930 - goto error_clk_disable_unprepare; 931 + return ret; 931 932 932 933 ret = ad7124_check_chip_id(st); 933 934 if (ret) 934 - goto error_clk_disable_unprepare; 935 + return ret; 935 936 936 937 ret = ad7124_setup(st); 937 938 if (ret < 0) 938 - goto error_clk_disable_unprepare; 939 + return ret; 939 940 940 - ret = ad_sd_setup_buffer_and_trigger(indio_dev); 941 + ret = devm_ad_sd_setup_buffer_and_trigger(&spi->dev, indio_dev); 941 942 if (ret < 0) 942 - goto error_clk_disable_unprepare; 943 + return ret; 943 944 944 - ret = iio_device_register(indio_dev); 945 - if (ret < 0) { 946 - dev_err(&spi->dev, "Failed to register iio device\n"); 947 - goto error_remove_trigger; 948 - } 945 + return devm_iio_device_register(&spi->dev, indio_dev); 949 946 950 - return 0; 951 - 952 - error_remove_trigger: 953 - ad_sd_cleanup_buffer_and_trigger(indio_dev); 954 - error_clk_disable_unprepare: 955 - clk_disable_unprepare(st->mclk); 956 - 957 - return ret; 958 - } 959 - 960 - static int ad7124_remove(struct spi_device *spi) 961 - { 962 - struct iio_dev *indio_dev = spi_get_drvdata(spi); 963 - struct ad7124_state *st = iio_priv(indio_dev); 964 - 965 - iio_device_unregister(indio_dev); 966 - ad_sd_cleanup_buffer_and_trigger(indio_dev); 967 - clk_disable_unprepare(st->mclk); 968 - 969 - return 0; 970 947 } 971 948 972 949 static const struct of_device_id ad7124_of_match[] = { ··· 964 981 .of_match_table = ad7124_of_match, 965 982 }, 966 983 .probe = ad7124_probe, 967 - .remove = ad7124_remove, 968 984 }; 969 985 module_spi_driver(ad71124_driver); 970 986