iio: humidity: hts221: Make use of device properties

Device property API allows to gather device resources from different sources,
such as ACPI. Convert the drivers to unleash the power of device property API.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
index 5f142a4..9fb3f33 100644 (file)
--- a/drivers/iio/humidity/hts221_buffer.c
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -77,7 +77,6 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
        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;
-       struct device_node *np = hw->dev->of_node;
        unsigned long irq_type;
        int err;
 
@@ -106,7 +105,7 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
        if (err < 0)
                return err;
 
-       if ((np && of_property_read_bool(np, "drive-open-drain")) ||
+       if (device_property_read_bool(hw->dev, "drive-open-drain") ||
            (pdata && pdata->open_drain)) {
                irq_type |= IRQF_SHARED;
                open_drain = true;

diff --git a/drivers/iio/humidity/hts221_i2c.c b/drivers/iio/humidity/hts221_i2c.c
index 4272b70..1398794 100644 (file)
--- a/drivers/iio/humidity/hts221_i2c.c
+++ b/drivers/iio/humidity/hts221_i2c.c
@@ -63,7 +63,7 @@ static struct i2c_driver hts221_driver = {
        .driver = {
                .name = "hts221_i2c",
                .pm = &hts221_pm_ops,
-               .of_match_table = of_match_ptr(hts221_i2c_of_match),
+               .of_match_table = hts221_i2c_of_match,
                .acpi_match_table = ACPI_PTR(hts221_acpi_match),
        },
        .probe = hts221_i2c_probe,

diff --git a/drivers/iio/humidity/hts221_spi.c b/drivers/iio/humidity/hts221_spi.c
index 055dba8..ba11154 100644 (file)
--- a/drivers/iio/humidity/hts221_spi.c
+++ b/drivers/iio/humidity/hts221_spi.c
@@ -56,7 +56,7 @@ static struct spi_driver hts221_driver = {
        .driver = {
                .name = "hts221_spi",
                .pm = &hts221_pm_ops,
-               .of_match_table = of_match_ptr(hts221_spi_of_match),
+               .of_match_table = hts221_spi_of_match,
        },
        .probe = hts221_spi_probe,
        .id_table = hts221_spi_id_table,