lkml.org 
[lkml]   [2017]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] iio/light/max44000: Use common error handling code in max44000_probe()
Date
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 26 Oct 2017 10:30:57 +0200

* Add a jump target so that a specific error message is stored only once
at the end of this function implementation.

* Replace two calls of the function "dev_err" by goto statements.

* Adjust condition checks.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/iio/light/max44000.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index bcdb0eb9e537..8f4bc6a918d5 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -569,18 +569,14 @@ static int max44000_probe(struct i2c_client *client,
* Set a middle value so that we get some sort of valid data by default.
*/
ret = max44000_write_led_current_raw(data, MAX44000_LED_CURRENT_DEFAULT);
- if (ret < 0) {
- dev_err(&client->dev, "failed to write init config: %d\n", ret);
- return ret;
- }
+ if (ret)
+ goto report_failure;

/* Reset CFG bits to ALS_PRX mode which allows easy reading of both values. */
reg = MAX44000_CFG_TRIM | MAX44000_CFG_MODE_ALS_PRX;
ret = regmap_write(data->regmap, MAX44000_REG_CFG_MAIN, reg);
- if (ret < 0) {
- dev_err(&client->dev, "failed to write init config: %d\n", ret);
- return ret;
- }
+ if (ret)
+ goto report_failure;

/* Read status at least once to clear any stale interrupt bits. */
ret = regmap_read(data->regmap, MAX44000_REG_STATUS, &reg);
@@ -596,6 +592,10 @@ static int max44000_probe(struct i2c_client *client,
}

return iio_device_register(indio_dev);
+
+report_failure:
+ dev_err(&client->dev, "failed to write init config: %d\n", ret);
+ return ret;
}

static int max44000_remove(struct i2c_client *client)
--
2.14.3
\
 
 \ /
  Last update: 2017-10-26 10:41    [W:0.045 / U:0.896 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site