| Message ID | 20241031-iio-fix-write-event-config-signature-v2-12-2bcacbb517a2@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: fix write_event_config signature | expand |
On Thu, 31 Oct 2024 16:27:07 +0100 Julien Stephan <jstephan@baylibre.com> wrote: > 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> > --- > drivers/iio/light/apds9300.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c > index 95861b2a5b2d94011d894959289c5c4f06cc1efe..98bdf8bc298b664aba71d3c38d7f224808e5997d 100644 > --- a/drivers/iio/light/apds9300.c > +++ b/drivers/iio/light/apds9300.c > @@ -46,10 +46,10 @@ > struct apds9300_data { > struct i2c_client *client; > struct mutex mutex; > - int power_state; > + bool power_state; > int thresh_low; > int thresh_hi; > - int intr_en; > + bool intr_en; > }; > > /* Lux calculation */ > @@ -148,7 +148,7 @@ static int apds9300_set_thresh_hi(struct apds9300_data *data, int value) > 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; > u8 cmd; > @@ -169,7 +169,7 @@ static int apds9300_set_intr_state(struct apds9300_data *data, int state) > 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) There are a few calls of this where an explicit 1 or 0 is used. Those should be updated to be bools. I added this diff whilst applying. Shout if you disagree with it. diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c index 98bdf8bc298b..938d76f7e312 100644 --- a/drivers/iio/light/apds9300.c +++ b/drivers/iio/light/apds9300.c @@ -221,7 +221,7 @@ static int apds9300_chip_init(struct apds9300_data *data) * Disable interrupt to ensure thai it is doesn't enable * i.e. after device soft reset */ - ret = apds9300_set_intr_state(data, 0); + ret = apds9300_set_intr_state(data, false); if (ret < 0) goto err; @@ -459,8 +459,8 @@ static void apds9300_remove(struct i2c_client *client) iio_device_unregister(indio_dev); /* Ensure that power off and interrupts are disabled */ - apds9300_set_intr_state(data, 0); - apds9300_set_power_state(data, 0); + apds9300_set_intr_state(data, false); + apds9300_set_power_state(data, false); } static int apds9300_suspend(struct device *dev) @@ -470,7 +470,7 @@ static int apds9300_suspend(struct device *dev) int ret; mutex_lock(&data->mutex); - ret = apds9300_set_power_state(data, 0); + ret = apds9300_set_power_state(data, false); mutex_unlock(&data->mutex); return ret; @@ -483,7 +483,7 @@ static int apds9300_resume(struct device *dev) int ret; mutex_lock(&data->mutex); - ret = apds9300_set_power_state(data, 1); + ret = apds9300_set_power_state(data, true); mutex_unlock(&data->mutex); return ret; > { > int ret; > u8 cmd; >
diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c index 95861b2a5b2d94011d894959289c5c4f06cc1efe..98bdf8bc298b664aba71d3c38d7f224808e5997d 100644 --- a/drivers/iio/light/apds9300.c +++ b/drivers/iio/light/apds9300.c @@ -46,10 +46,10 @@ struct apds9300_data { struct i2c_client *client; struct mutex mutex; - int power_state; + bool power_state; int thresh_low; int thresh_hi; - int intr_en; + bool intr_en; }; /* Lux calculation */ @@ -148,7 +148,7 @@ static int apds9300_set_thresh_hi(struct apds9300_data *data, int value) 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; u8 cmd; @@ -169,7 +169,7 @@ static int apds9300_set_intr_state(struct apds9300_data *data, int state) 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; u8 cmd;
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> --- drivers/iio/light/apds9300.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)