iio: humidity: hts221: remove usage of iio_priv_to_dev()

We may want to get rid of the iio_priv_to_dev() helper. That's a bit
uncertain at this point. The reason is that we will hide some of the
members of the iio_dev structure (to prevent drivers from accessing them
directly), and that will also mean hiding the implementation of the
iio_priv_to_dev() helper inside the IIO core.

Hiding the implementation of iio_priv_to_dev() implies that some fast-paths
may not be fast anymore, so a general idea is to try to get rid of the
iio_priv_to_dev() altogether.

For this driver, removing the iio_priv_to_dev() helper means passing the
iio_dev object on hts221_allocate_buffers() & hts221_allocate_trigger().

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/humidity/hts221.h b/drivers/iio/humidity/hts221.h
index 7d6771f7cf473663b7607a0fc886fa2b4822d802..7c650df77556e16d7417c0ad98713254cffb8fd6 100644 (file)
--- a/drivers/iio/humidity/hts221.h
+++ b/drivers/iio/humidity/hts221.h
@@ -46,7 +46,7 @@ extern const struct dev_pm_ops hts221_pm_ops;
 int hts221_probe(struct device *dev, int irq, const char *name,
                 struct regmap *regmap);
 int hts221_set_enable(struct hts221_hw *hw, bool enable);
-int hts221_allocate_buffers(struct hts221_hw *hw);
-int hts221_allocate_trigger(struct hts221_hw *hw);
+int hts221_allocate_buffers(struct iio_dev *iio_dev);
+int hts221_allocate_trigger(struct iio_dev *iio_dev);
 
 #endif /* HTS221_H */

diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
index 9fb3f33614d401b370f30c0a6ab835074dc56ae6..21c6c160462d4cfeace7933f52136bad0279f63b 100644 (file)
--- a/drivers/iio/humidity/hts221_buffer.c
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -72,10 +72,10 @@ static irqreturn_t hts221_trigger_handler_thread(int irq, void *private)
        return IRQ_HANDLED;
 }
 
-int hts221_allocate_trigger(struct hts221_hw *hw)
+int hts221_allocate_trigger(struct iio_dev *iio_dev)
 {
+       struct hts221_hw *hw = iio_priv(iio_dev);
        struct st_sensors_platform_data *pdata = dev_get_platdata(hw->dev);
-       struct iio_dev *iio_dev = iio_priv_to_dev(hw);
        bool irq_active_low = false, open_drain = false;
        unsigned long irq_type;
        int err;
@@ -190,9 +190,10 @@ out:
        return IRQ_HANDLED;
 }
 
-int hts221_allocate_buffers(struct hts221_hw *hw)
+int hts221_allocate_buffers(struct iio_dev *iio_dev)
 {
-       return devm_iio_triggered_buffer_setup(hw->dev, iio_priv_to_dev(hw),
+       struct hts221_hw *hw = iio_priv(iio_dev);
+       return devm_iio_triggered_buffer_setup(hw->dev, iio_dev,
                                        NULL, hts221_buffer_handler_thread,
                                        &hts221_buffer_ops);
 }

diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
index 9003671f14fb3ebb5fb4719332c5323fb21ae4cc..7ce1bd1defa06cc485a51e5b35ae0eb6af0f787f 100644 (file)
--- a/drivers/iio/humidity/hts221_core.c
+++ b/drivers/iio/humidity/hts221_core.c
@@ -621,11 +621,11 @@ int hts221_probe(struct device *dev, int irq, const char *name,
        }
 
        if (hw->irq > 0) {
-               err = hts221_allocate_buffers(hw);
+               err = hts221_allocate_buffers(iio_dev);
                if (err < 0)
                        return err;
 
-               err = hts221_allocate_trigger(hw);
+               err = hts221_allocate_trigger(iio_dev);
                if (err)
                        return err;
        }