aboutsummaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
authorGravatar Subhajit Ghosh <subhajit.ghosh@tweaklogic.com> 2024-04-27 18:39:14 +0930
committerGravatar Jonathan Cameron <Jonathan.Cameron@huawei.com> 2024-04-28 12:46:53 +0100
commit0d8d62640763edfc11cc8568fe2115ad5af4e67e (patch)
tree84e46aec3501b0770c89b7ad1e33cd2f55b6dde3 /drivers/iio
parentMerge tag 'peci-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-0d8d62640763edfc11cc8568fe2115ad5af4e67e.tar.gz
linux-0d8d62640763edfc11cc8568fe2115ad5af4e67e.tar.bz2
linux-0d8d62640763edfc11cc8568fe2115ad5af4e67e.zip
iio: light: apds9306: Fix input arguments to in_range()
Third input argument to in_range() function requires the number of values in range, not the last value in that range. Update macro for persistence and adaptive threshold to reflect number of values supported instead of the maximum values supported. Fixes: 620d1e6c7a3f ("iio: light: Add support for APDS9306 Light Sensor") Signed-off-by: Subhajit Ghosh <subhajit.ghosh@tweaklogic.com> Link: https://lore.kernel.org/r/20240427090914.37274-1-subhajit.ghosh@tweaklogic.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/light/apds9306.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/light/apds9306.c b/drivers/iio/light/apds9306.c
index 46c647ccd44c..d6627b3e6000 100644
--- a/drivers/iio/light/apds9306.c
+++ b/drivers/iio/light/apds9306.c
@@ -55,8 +55,8 @@
#define APDS9306_ALS_DATA_STAT_MASK BIT(3)
#define APDS9306_ALS_THRES_VAL_MAX (BIT(20) - 1)
-#define APDS9306_ALS_THRES_VAR_VAL_MAX (BIT(3) - 1)
-#define APDS9306_ALS_PERSIST_VAL_MAX (BIT(4) - 1)
+#define APDS9306_ALS_THRES_VAR_NUM_VALS 8
+#define APDS9306_ALS_PERSIST_NUM_VALS 16
#define APDS9306_ALS_READ_DATA_DELAY_US (20 * USEC_PER_MSEC)
#define APDS9306_NUM_REPEAT_RATES 7
#define APDS9306_INT_SRC_CLEAR 0
@@ -726,7 +726,7 @@ static int apds9306_event_period_get(struct apds9306_data *data, int *val)
if (ret)
return ret;
- if (!in_range(period, 0, APDS9306_ALS_PERSIST_VAL_MAX))
+ if (!in_range(period, 0, APDS9306_ALS_PERSIST_NUM_VALS))
return -EINVAL;
*val = period;
@@ -738,7 +738,7 @@ static int apds9306_event_period_set(struct apds9306_data *data, int val)
{
struct apds9306_regfields *rf = &data->rf;
- if (!in_range(val, 0, APDS9306_ALS_PERSIST_VAL_MAX))
+ if (!in_range(val, 0, APDS9306_ALS_PERSIST_NUM_VALS))
return -EINVAL;
return regmap_field_write(rf->int_persist_val, val);
@@ -796,7 +796,7 @@ static int apds9306_event_thresh_adaptive_get(struct apds9306_data *data, int *v
if (ret)
return ret;
- if (!in_range(thr_adpt, 0, APDS9306_ALS_THRES_VAR_VAL_MAX))
+ if (!in_range(thr_adpt, 0, APDS9306_ALS_THRES_VAR_NUM_VALS))
return -EINVAL;
*val = thr_adpt;
@@ -808,7 +808,7 @@ static int apds9306_event_thresh_adaptive_set(struct apds9306_data *data, int va
{
struct apds9306_regfields *rf = &data->rf;
- if (!in_range(val, 0, APDS9306_ALS_THRES_VAR_VAL_MAX))
+ if (!in_range(val, 0, APDS9306_ALS_THRES_VAR_NUM_VALS))
return -EINVAL;
return regmap_field_write(rf->int_thresh_var_val, val);