From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <linux-kernel@vger.kernel.org>
Cc: <gregkh@linuxfoundation.org>,
Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH 2/3] uio: uio_mf624: use devm_kzalloc() for uio_info object
Date: Fri, 20 Nov 2020 10:42:06 +0200 [thread overview]
Message-ID: <20201120084207.50736-2-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20201120084207.50736-1-alexandru.ardelean@analog.com>
This change uses the devm_kzalloc() function to tie the life-time of the
uio_info object to PCI device. This cleans up the exit & error path a bit.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/uio/uio_mf624.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/uio/uio_mf624.c b/drivers/uio/uio_mf624.c
index b6a406986667..5065c6a073a8 100644
--- a/drivers/uio/uio_mf624.c
+++ b/drivers/uio/uio_mf624.c
@@ -136,12 +136,12 @@ static int mf624_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
struct uio_info *info;
- info = kzalloc(sizeof(struct uio_info), GFP_KERNEL);
+ info = devm_kzalloc(&dev->dev, sizeof(struct uio_info), GFP_KERNEL);
if (!info)
return -ENOMEM;
if (pci_enable_device(dev))
- goto out_free;
+ return -ENODEV;
if (pci_request_regions(dev, "mf624"))
goto out_disable;
@@ -189,8 +189,6 @@ static int mf624_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
out_disable:
pci_disable_device(dev);
-out_free:
- kfree(info);
return -ENODEV;
}
@@ -207,8 +205,6 @@ static void mf624_pci_remove(struct pci_dev *dev)
iounmap(info->mem[0].internal_addr);
iounmap(info->mem[1].internal_addr);
iounmap(info->mem[2].internal_addr);
-
- kfree(info);
}
static const struct pci_device_id mf624_pci_id[] = {
--
2.27.0
next prev parent reply other threads:[~2020-11-20 8:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 8:42 [PATCH 1/3] uio: uio_sercos3: use device-managed functions for simple allocs Alexandru Ardelean
2020-11-20 8:42 ` Alexandru Ardelean [this message]
2020-11-20 8:42 ` [PATCH 3/3] uio: uio_netx: use devm_kzalloc() for or uio_info object 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=20201120084207.50736-2-alexandru.ardelean@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=gregkh@linuxfoundation.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).