iio: adc: hx711: remove hx711_remove()

By using a few more devm_ functions, we can remove the hx711_remove()
function in the hx711 driver.

platform_set_drvdata() is also removed since there are no more
callers of platform_get_drvdata().

Signed-off-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Andreas Klinger <ak@it-klinger.de>
Link: https://patch.msgid.link/20240621-iio-regulator-refactor-round-2-v1-3-49e50cd0b99a@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c
index 6efdc971689c95bcd35e601059fe28259787c8ba..8461b1fe6bad1c4c3bbb3d8756eec5e90e1a80c1 100644 (file)
--- a/drivers/iio/adc/hx711.c
+++ b/drivers/iio/adc/hx711.c
@@ -539,43 +539,27 @@ static int hx711_probe(struct platform_device *pdev)
        hx711_data->data_ready_delay_ns =
                                1000000000 / hx711_data->clock_frequency;
 
-       platform_set_drvdata(pdev, indio_dev);
-
        indio_dev->name = "hx711";
        indio_dev->info = &hx711_iio_info;
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->channels = hx711_chan_spec;
        indio_dev->num_channels = ARRAY_SIZE(hx711_chan_spec);
 
-       ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time,
-                                                       hx711_trigger, NULL);
+       ret = devm_iio_triggered_buffer_setup(dev, indio_dev,
+                                             iio_pollfunc_store_time,
+                                             hx711_trigger, NULL);
        if (ret < 0) {
                dev_err(dev, "setup of iio triggered buffer failed\n");
                return ret;
        }
 
-       ret = iio_device_register(indio_dev);
+       ret = devm_iio_device_register(dev, indio_dev);
        if (ret < 0) {
                dev_err(dev, "Couldn't register the device\n");
-               goto error_buffer;
+               return ret;
        }
 
        return 0;
-
-error_buffer:
-       iio_triggered_buffer_cleanup(indio_dev);
-
-       return ret;
-}
-
-static void hx711_remove(struct platform_device *pdev)
-{
-       struct iio_dev *indio_dev;
-
-       indio_dev = platform_get_drvdata(pdev);
-
-       iio_device_unregister(indio_dev);
-       iio_triggered_buffer_cleanup(indio_dev);
 }
 
 static const struct of_device_id of_hx711_match[] = {
@@ -587,7 +571,6 @@ MODULE_DEVICE_TABLE(of, of_hx711_match);
 
 static struct platform_driver hx711_driver = {
        .probe          = hx711_probe,
-       .remove_new     = hx711_remove,
        .driver         = {
                .name           = "hx711-gpio",
                .of_match_table = of_hx711_match,