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 v2 1/5] Input: adp5589: use devm_kzalloc() to allocate the kpad object
Date: Thu, 12 Nov 2020 09:43:04 +0200 [thread overview]
Message-ID: <20201112074308.71351-2-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20201112074308.71351-1-alexandru.ardelean@analog.com>
This removes the need to manually free the kpad object and cleans up some
exit/error paths.
The error path cleanup should reduce the risk of any memory leaks with this
object.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/input/keyboard/adp5589-keys.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index eb0e9cd66bcb..922497b65ab0 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -1007,7 +1007,7 @@ static int adp5589_probe(struct i2c_client *client,
return -EINVAL;
}
- kpad = kzalloc(sizeof(*kpad), GFP_KERNEL);
+ kpad = devm_kzalloc(&client->dev, sizeof(*kpad), GFP_KERNEL);
if (!kpad)
return -ENOMEM;
@@ -1028,17 +1028,15 @@ static int adp5589_probe(struct i2c_client *client,
}
ret = adp5589_read(client, ADP5589_5_ID);
- if (ret < 0) {
- error = ret;
- goto err_free_mem;
- }
+ if (ret < 0)
+ return ret;
revid = (u8) ret & ADP5589_5_DEVICE_ID_MASK;
if (pdata->keymapsize) {
error = adp5589_keypad_add(kpad, revid);
if (error)
- goto err_free_mem;
+ return error;
}
error = adp5589_setup(kpad);
@@ -1059,8 +1057,6 @@ static int adp5589_probe(struct i2c_client *client,
err_keypad_remove:
adp5589_keypad_remove(kpad);
-err_free_mem:
- kfree(kpad);
return error;
}
@@ -1072,7 +1068,6 @@ static int adp5589_remove(struct i2c_client *client)
adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
adp5589_keypad_remove(kpad);
adp5589_gpio_remove(kpad);
- kfree(kpad);
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2020-11-12 7:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 7:43 [PATCH v2 0/5] Input: adp5589: cleanup and use device-managed functions Alexandru Ardelean
2020-11-12 7:43 ` Alexandru Ardelean [this message]
2020-11-19 7:06 ` [PATCH v2 1/5] Input: adp5589: use devm_kzalloc() to allocate the kpad object Dmitry Torokhov
2020-11-12 7:43 ` [PATCH v2 2/5] Input: adp5589: use device-managed function in adp5589_keypad_add() Alexandru Ardelean
2020-11-19 7:09 ` Dmitry Torokhov
2020-11-12 7:43 ` [PATCH v2 3/5] Input: adp5589: remove setup/teardown hooks for gpios Alexandru Ardelean
2020-11-19 7:10 ` Dmitry Torokhov
2020-11-12 7:43 ` [PATCH v2 4/5] Input: adp5589: use devm_gpiochip_add_data() " Alexandru Ardelean
2020-11-19 7:10 ` Dmitry Torokhov
2020-11-12 7:43 ` [PATCH v2 5/5] Input: adp5589: use devm_add_action_or_reset() for register clear Alexandru Ardelean
2020-11-19 7:10 ` Dmitry Torokhov
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=20201112074308.71351-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).