Commit e3e25446 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron

iio: humidity: hts221: squash hts221_power_on/off in hts221_set_enable

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@st.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent ffebe74b
...@@ -62,8 +62,7 @@ extern const struct dev_pm_ops hts221_pm_ops; ...@@ -62,8 +62,7 @@ extern const struct dev_pm_ops hts221_pm_ops;
int hts221_config_drdy(struct hts221_hw *hw, bool enable); int hts221_config_drdy(struct hts221_hw *hw, bool enable);
int hts221_probe(struct iio_dev *iio_dev); int hts221_probe(struct iio_dev *iio_dev);
int hts221_power_on(struct hts221_hw *hw); int hts221_set_enable(struct hts221_hw *hw, bool enable);
int hts221_power_off(struct hts221_hw *hw);
int hts221_allocate_buffers(struct hts221_hw *hw); int hts221_allocate_buffers(struct hts221_hw *hw);
int hts221_allocate_trigger(struct hts221_hw *hw); int hts221_allocate_trigger(struct hts221_hw *hw);
......
...@@ -109,12 +109,12 @@ int hts221_allocate_trigger(struct hts221_hw *hw) ...@@ -109,12 +109,12 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
static int hts221_buffer_preenable(struct iio_dev *iio_dev) static int hts221_buffer_preenable(struct iio_dev *iio_dev)
{ {
return hts221_power_on(iio_priv(iio_dev)); return hts221_set_enable(iio_priv(iio_dev), true);
} }
static int hts221_buffer_postdisable(struct iio_dev *iio_dev) static int hts221_buffer_postdisable(struct iio_dev *iio_dev)
{ {
return hts221_power_off(iio_priv(iio_dev)); return hts221_set_enable(iio_priv(iio_dev), false);
} }
static const struct iio_buffer_setup_ops hts221_buffer_ops = { static const struct iio_buffer_setup_ops hts221_buffer_ops = {
......
...@@ -285,30 +285,16 @@ hts221_sysfs_temp_oversampling_avail(struct device *dev, ...@@ -285,30 +285,16 @@ hts221_sysfs_temp_oversampling_avail(struct device *dev,
return len; return len;
} }
int hts221_power_on(struct hts221_hw *hw) int hts221_set_enable(struct hts221_hw *hw, bool enable)
{ {
int err; int err;
err = hts221_write_with_mask(hw, HTS221_REG_CNTRL1_ADDR, err = hts221_write_with_mask(hw, HTS221_REG_CNTRL1_ADDR,
HTS221_ENABLE_MASK, true); HTS221_ENABLE_MASK, enable);
if (err < 0)
return err;
hw->enabled = true;
return 0;
}
int hts221_power_off(struct hts221_hw *hw)
{
int err;
err = hts221_write_with_mask(hw, HTS221_REG_CNTRL1_ADDR,
HTS221_ENABLE_MASK, false);
if (err < 0) if (err < 0)
return err; return err;
hw->enabled = false; hw->enabled = enable;
return 0; return 0;
} }
...@@ -463,7 +449,7 @@ static int hts221_read_oneshot(struct hts221_hw *hw, u8 addr, int *val) ...@@ -463,7 +449,7 @@ static int hts221_read_oneshot(struct hts221_hw *hw, u8 addr, int *val)
u8 data[HTS221_DATA_SIZE]; u8 data[HTS221_DATA_SIZE];
int err; int err;
err = hts221_power_on(hw); err = hts221_set_enable(hw, true);
if (err < 0) if (err < 0)
return err; return err;
...@@ -473,7 +459,7 @@ static int hts221_read_oneshot(struct hts221_hw *hw, u8 addr, int *val) ...@@ -473,7 +459,7 @@ static int hts221_read_oneshot(struct hts221_hw *hw, u8 addr, int *val)
if (err < 0) if (err < 0)
return err; return err;
hts221_power_off(hw); hts221_set_enable(hw, false);
*val = (s16)get_unaligned_le16(data); *val = (s16)get_unaligned_le16(data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment