mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-22 16:06:04 -05:00
iio: light: apds9300: use bool for event state
Since the write_event_config callback now uses a bool for the state parameter, update apds9300_set_intr_state accordingly and change intr_en to bool. Also update apds9300_set_power_state and power_state for consistency. Signed-off-by: Julien Stephan <jstephan@baylibre.com> Link: https://patch.msgid.link/20241031-iio-fix-write-event-config-signature-v2-12-2bcacbb517a2@baylibre.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
3121da857c
commit
ad531aa484
1 changed files with 9 additions and 9 deletions
|
@ -46,10 +46,10 @@
|
||||||
struct apds9300_data {
|
struct apds9300_data {
|
||||||
struct i2c_client *client;
|
struct i2c_client *client;
|
||||||
struct mutex mutex;
|
struct mutex mutex;
|
||||||
int power_state;
|
bool power_state;
|
||||||
int thresh_low;
|
int thresh_low;
|
||||||
int thresh_hi;
|
int thresh_hi;
|
||||||
int intr_en;
|
bool intr_en;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Lux calculation */
|
/* Lux calculation */
|
||||||
|
@ -148,7 +148,7 @@ static int apds9300_set_thresh_hi(struct apds9300_data *data, int value)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int apds9300_set_intr_state(struct apds9300_data *data, int state)
|
static int apds9300_set_intr_state(struct apds9300_data *data, bool state)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
u8 cmd;
|
u8 cmd;
|
||||||
|
@ -169,7 +169,7 @@ static int apds9300_set_intr_state(struct apds9300_data *data, int state)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int apds9300_set_power_state(struct apds9300_data *data, int state)
|
static int apds9300_set_power_state(struct apds9300_data *data, bool state)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
u8 cmd;
|
u8 cmd;
|
||||||
|
@ -221,7 +221,7 @@ static int apds9300_chip_init(struct apds9300_data *data)
|
||||||
* Disable interrupt to ensure thai it is doesn't enable
|
* Disable interrupt to ensure thai it is doesn't enable
|
||||||
* i.e. after device soft reset
|
* i.e. after device soft reset
|
||||||
*/
|
*/
|
||||||
ret = apds9300_set_intr_state(data, 0);
|
ret = apds9300_set_intr_state(data, false);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
@ -459,8 +459,8 @@ static void apds9300_remove(struct i2c_client *client)
|
||||||
iio_device_unregister(indio_dev);
|
iio_device_unregister(indio_dev);
|
||||||
|
|
||||||
/* Ensure that power off and interrupts are disabled */
|
/* Ensure that power off and interrupts are disabled */
|
||||||
apds9300_set_intr_state(data, 0);
|
apds9300_set_intr_state(data, false);
|
||||||
apds9300_set_power_state(data, 0);
|
apds9300_set_power_state(data, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int apds9300_suspend(struct device *dev)
|
static int apds9300_suspend(struct device *dev)
|
||||||
|
@ -470,7 +470,7 @@ static int apds9300_suspend(struct device *dev)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
mutex_lock(&data->mutex);
|
mutex_lock(&data->mutex);
|
||||||
ret = apds9300_set_power_state(data, 0);
|
ret = apds9300_set_power_state(data, false);
|
||||||
mutex_unlock(&data->mutex);
|
mutex_unlock(&data->mutex);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -483,7 +483,7 @@ static int apds9300_resume(struct device *dev)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
mutex_lock(&data->mutex);
|
mutex_lock(&data->mutex);
|
||||||
ret = apds9300_set_power_state(data, 1);
|
ret = apds9300_set_power_state(data, true);
|
||||||
mutex_unlock(&data->mutex);
|
mutex_unlock(&data->mutex);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue