From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <dmitry.torokhov@gmail.com>,
Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH 1/6] Input: adp5589: use a single variable for error in probe
Date: Wed, 11 Nov 2020 10:48:28 +0200 [thread overview]
Message-ID: <20201111084833.40995-2-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20201111084833.40995-1-alexandru.ardelean@analog.com>
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
next prev parent reply other threads:[~2020-11-11 8:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 8:48 [PATCH 0/6] Input: adp5589: cleanup and use device-managed functions Alexandru Ardelean
2020-11-11 8:48 ` Alexandru Ardelean [this message]
2020-11-12 0:37 ` [PATCH 1/6] Input: adp5589: use a single variable for error in probe Dmitry Torokhov
2020-11-12 6:39 ` Ardelean, Alexandru
2020-11-12 6:51 ` Ardelean, Alexandru
2020-11-11 8:48 ` [PATCH 2/6] Input: adp5589: use devm_kzalloc() to allocate the kpad object Alexandru Ardelean
2020-11-11 8:48 ` [PATCH 3/6] Input: adp5589: use device-managed function in adp5589_keypad_add() Alexandru Ardelean
2020-11-11 8:48 ` [PATCH 4/6] Input: adp5589: remove setup/teardown hooks for gpios Alexandru Ardelean
2020-11-11 8:48 ` [PATCH 5/6] Input: adp5589: use devm_gpiochip_add_data() " Alexandru Ardelean
2020-11-11 8:48 ` [PATCH 6/6] Input: adp5589: use devm_add_action_or_reset() for register clear Alexandru Ardelean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201111084833.40995-2-alexandru.ardelean@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).