lkml.org 
[lkml]   [2020]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/6] Input: adp5589: use a single variable for error in probe
Date
The 'error' & 'ret' variables are used. This is a bit of duplication.
This change replaces the use of error with the 'ret' variable since the
name is a bit more generic.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/input/keyboard/adp5589-keys.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index eb0e9cd66bcb..4cfb26e3d79c 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -994,7 +994,7 @@ static int adp5589_probe(struct i2c_client *client,
const struct adp5589_kpad_platform_data *pdata =
dev_get_platdata(&client->dev);
unsigned int revid;
- int error, ret;
+ int ret;

if (!i2c_check_functionality(client->adapter,
I2C_FUNC_SMBUS_BYTE_DATA)) {
@@ -1028,28 +1028,26 @@ static int adp5589_probe(struct i2c_client *client,
}

ret = adp5589_read(client, ADP5589_5_ID);
- if (ret < 0) {
- error = ret;
+ if (ret < 0)
goto err_free_mem;
- }

revid = (u8) ret & ADP5589_5_DEVICE_ID_MASK;

if (pdata->keymapsize) {
- error = adp5589_keypad_add(kpad, revid);
- if (error)
+ ret = adp5589_keypad_add(kpad, revid);
+ if (ret)
goto err_free_mem;
}

- error = adp5589_setup(kpad);
- if (error)
+ ret = adp5589_setup(kpad);
+ if (ret)
goto err_keypad_remove;

if (kpad->gpimapsize)
adp5589_report_switch_state(kpad);

- error = adp5589_gpio_add(kpad);
- if (error)
+ ret = adp5589_gpio_add(kpad);
+ if (ret)
goto err_keypad_remove;

i2c_set_clientdata(client, kpad);
@@ -1062,7 +1060,7 @@ static int adp5589_probe(struct i2c_client *client,
err_free_mem:
kfree(kpad);

- return error;
+ return ret;
}

static int adp5589_remove(struct i2c_client *client)
--
2.17.1
\
 
 \ /
  Last update: 2020-11-11 09:44    [W:0.102 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site