From: Aaron Sierra <asierra@xes-inc.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] lpc_ich: use devres API to allocate private data
Date: Thu, 14 Feb 2013 11:35:04 -0600 (CST) [thread overview]
Message-ID: <9be5e8ee-d1b9-4509-b147-879281e10efc@zimbra> (raw)
In-Reply-To: <774339a2-e7cc-4204-a935-0a1b59e2ece8@zimbra>
Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
---
drivers/mfd/lpc_ich.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index a0cfdf9..1264b68 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -878,7 +878,8 @@ static int lpc_ich_probe(struct pci_dev *dev,
int ret;
bool cell_added = false;
- priv = kmalloc(GFP_KERNEL, sizeof(struct lpc_ich_priv));
+ priv = devm_kzalloc(&dev->dev,
+ sizeof(struct lpc_ich_priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -914,7 +915,6 @@ static int lpc_ich_probe(struct pci_dev *dev,
dev_warn(&dev->dev, "No MFD cells added\n");
lpc_ich_restore_config_space(dev);
pci_set_drvdata(dev, NULL);
- kfree(priv);
return -ENODEV;
}
@@ -923,12 +923,9 @@ static int lpc_ich_probe(struct pci_dev *dev,
static void lpc_ich_remove(struct pci_dev *dev)
{
- void *priv = pci_get_drvdata(dev);
-
mfd_remove_devices(&dev->dev);
lpc_ich_restore_config_space(dev);
pci_set_drvdata(dev, NULL);
- kfree(priv);
}
static struct pci_driver lpc_ich_driver = {
--
1.7.9.5
next parent reply other threads:[~2013-02-14 17:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <774339a2-e7cc-4204-a935-0a1b59e2ece8@zimbra>
2013-02-14 17:35 ` Aaron Sierra [this message]
2013-02-15 14:56 ` Aaron Sierra
2013-02-15 17:45 ` Samuel Ortiz
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=9be5e8ee-d1b9-4509-b147-879281e10efc@zimbra \
--to=asierra@xes-inc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/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
all inboxes | Powered by JetHome®