From: Lucas Tanure <tanure@linux.com>
To: Bastien Nocera <hadess@hadess.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Lucas Tanure <tanure@linux.com>
Subject: [PATCH] USB: apple-mfi-fastcharge: Use devm_kzalloc and simplify the code
Date: Sat, 14 Nov 2020 12:42:49 +0000 [thread overview]
Message-ID: <20201114124249.634234-1-tanure@linux.com> (raw)
Signed-off-by: Lucas Tanure <tanure@linux.com>
---
drivers/usb/misc/apple-mfi-fastcharge.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/misc/apple-mfi-fastcharge.c b/drivers/usb/misc/apple-mfi-fastcharge.c
index 9de0171b5177..de86e389a008 100644
--- a/drivers/usb/misc/apple-mfi-fastcharge.c
+++ b/drivers/usb/misc/apple-mfi-fastcharge.c
@@ -178,16 +178,13 @@ static int mfi_fc_probe(struct usb_device *udev)
{
struct power_supply_config battery_cfg = {};
struct mfi_device *mfi = NULL;
- int err;
if (!mfi_fc_match(udev))
return -ENODEV;
- mfi = kzalloc(sizeof(struct mfi_device), GFP_KERNEL);
- if (!mfi) {
- err = -ENOMEM;
- goto error;
- }
+ mfi = devm_kzalloc(&udev->dev, sizeof(*mfi), GFP_KERNEL);
+ if (!mfi)
+ return -ENOMEM;
battery_cfg.drv_data = mfi;
@@ -197,8 +194,7 @@ static int mfi_fc_probe(struct usb_device *udev)
&battery_cfg);
if (IS_ERR(mfi->battery)) {
dev_err(&udev->dev, "Can't register battery\n");
- err = PTR_ERR(mfi->battery);
- goto error;
+ return PTR_ERR(mfi->battery);
}
mfi->udev = usb_get_dev(udev);
@@ -206,9 +202,6 @@ static int mfi_fc_probe(struct usb_device *udev)
return 0;
-error:
- kfree(mfi);
- return err;
}
static void mfi_fc_disconnect(struct usb_device *udev)
@@ -220,7 +213,7 @@ static void mfi_fc_disconnect(struct usb_device *udev)
power_supply_unregister(mfi->battery);
dev_set_drvdata(&udev->dev, NULL);
usb_put_dev(mfi->udev);
- kfree(mfi);
+ devm_kfree(&udev->dev, mfi);
}
static struct usb_device_driver mfi_fc_driver = {
--
2.29.2
next reply other threads:[~2020-11-14 12:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-14 12:42 Lucas Tanure [this message]
2020-11-14 12:56 ` [PATCH] USB: apple-mfi-fastcharge: Use devm_kzalloc and simplify the code Greg Kroah-Hartman
2020-11-14 14:17 ` Lucas Tanure
2020-11-14 15:02 ` Greg Kroah-Hartman
2020-11-15 8:13 ` Lucas Tanure
2020-11-15 8:26 ` Greg Kroah-Hartman
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=20201114124249.634234-1-tanure@linux.com \
--to=tanure@linux.com \
--cc=gregkh@linuxfoundation.org \
--cc=hadess@hadess.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@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