Skip to content

Commit f326d8f

Browse files
pedrobgennarijic23
authored andcommitted
iio: light: iqs621-als: prefer early error handling over if (!ret)
Handle errors as early as possible by replacing 'if (!ret)' with the more common form 'if (ret)'. This makes the code easier to read. Signed-off-by: Pedro Barletta Gennari <pedro.pbg@usp.br> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
1 parent 4bb3166 commit f326d8f

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

drivers/iio/light/iqs621-als.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -273,18 +273,22 @@ static int iqs621_als_write_event_config(struct iio_dev *indio_dev,
273273
iqs62x->dev_desc->als_mask,
274274
iqs621_als->range_en || state ? 0 :
275275
0xFF);
276-
if (!ret)
277-
iqs621_als->light_en = state;
278-
return ret;
276+
if (ret)
277+
return ret;
278+
iqs621_als->light_en = state;
279+
280+
return 0;
279281

280282
case IIO_INTENSITY:
281283
ret = regmap_update_bits(iqs62x->regmap, IQS620_GLBL_EVENT_MASK,
282284
iqs62x->dev_desc->als_mask,
283285
iqs621_als->light_en || state ? 0 :
284286
0xFF);
285-
if (!ret)
286-
iqs621_als->range_en = state;
287-
return ret;
287+
if (ret)
288+
return ret;
289+
iqs621_als->range_en = state;
290+
291+
return 0;
288292

289293
case IIO_PROXIMITY:
290294
ret = regmap_read(iqs62x->regmap, IQS622_IR_FLAGS, &val);
@@ -295,9 +299,11 @@ static int iqs621_als_write_event_config(struct iio_dev *indio_dev,
295299
ret = regmap_update_bits(iqs62x->regmap, IQS620_GLBL_EVENT_MASK,
296300
iqs62x->dev_desc->ir_mask,
297301
state ? 0 : 0xFF);
298-
if (!ret)
299-
iqs621_als->prox_en = state;
300-
return ret;
302+
if (ret)
303+
return ret;
304+
iqs621_als->prox_en = state;
305+
306+
return 0;
301307

302308
default:
303309
return -EINVAL;

0 commit comments

Comments
 (0)