From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Samuel Ortiz <sameo@linux.intel.com>, linux-wireless@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 05/12] NFC: fdp: Convert to use devres API
Date: Mon, 5 Jun 2017 23:20:02 +0300 [thread overview]
Message-ID: <20170605202009.78561-6-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170605202009.78561-1-andriy.shevchenko@linux.intel.com>
It looks like there are two leftovers, at least one of which can leak
the resource (IRQ).
Convert both places to use devm variants of functions.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/nfc/fdp/fdp.c | 15 ++++-----------
drivers/nfc/fdp/i2c.c | 10 +++++-----
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c
index 7c1eaea3b685..8946eb21128d 100644
--- a/drivers/nfc/fdp/fdp.c
+++ b/drivers/nfc/fdp/fdp.c
@@ -750,11 +750,9 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops,
u32 protocols;
int r;
- info = kzalloc(sizeof(struct fdp_nci_info), GFP_KERNEL);
- if (!info) {
- r = -ENOMEM;
- goto err_info_alloc;
- }
+ info = devm_kzalloc(dev, sizeof(struct fdp_nci_info), GFP_KERNEL);
+ if (!info)
+ return -ENOMEM;
info->phy = phy;
info->phy_ops = phy_ops;
@@ -776,8 +774,7 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops,
tx_tailroom);
if (!ndev) {
nfc_err(dev, "Cannot allocate nfc ndev\n");
- r = -ENOMEM;
- goto err_alloc_ndev;
+ return -ENOMEM;
}
r = nci_register_device(ndev);
@@ -793,9 +790,6 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops,
err_regdev:
nci_free_device(ndev);
-err_alloc_ndev:
- kfree(info);
-err_info_alloc:
return r;
}
EXPORT_SYMBOL(fdp_nci_probe);
@@ -809,7 +803,6 @@ void fdp_nci_remove(struct nci_dev *ndev)
nci_unregister_device(ndev);
nci_free_device(ndev);
- kfree(info);
}
EXPORT_SYMBOL(fdp_nci_remove);
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c
index 754d8d89c580..250cbaddb5a9 100644
--- a/drivers/nfc/fdp/i2c.c
+++ b/drivers/nfc/fdp/i2c.c
@@ -303,8 +303,7 @@ static int fdp_nci_i2c_probe(struct i2c_client *client)
return -ENODEV;
}
- phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy),
- GFP_KERNEL);
+ phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy), GFP_KERNEL);
if (!phy)
return -ENOMEM;
@@ -312,9 +311,10 @@ static int fdp_nci_i2c_probe(struct i2c_client *client)
phy->next_read_size = FDP_NCI_I2C_MIN_PAYLOAD;
i2c_set_clientdata(client, phy);
- r = request_threaded_irq(client->irq, NULL, fdp_nci_i2c_irq_thread_fn,
- IRQF_TRIGGER_RISING | IRQF_ONESHOT,
- FDP_I2C_DRIVER_NAME, phy);
+ r = devm_request_threaded_irq(dev, client->irq,
+ NULL, fdp_nci_i2c_irq_thread_fn,
+ IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+ FDP_I2C_DRIVER_NAME, phy);
if (r < 0) {
nfc_err(&client->dev, "Unable to register IRQ handler\n");
--
2.11.0
next prev parent reply other threads:[~2017-06-05 20:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-05 20:19 [PATCH v2 00/12] NFC: clean up for ACPI GPIO usage Andy Shevchenko
2017-06-05 20:19 ` [PATCH v2 01/12] NFC: pn544: Switch to devm_acpi_dev_add_driver_gpios() Andy Shevchenko
2017-06-05 20:19 ` [PATCH v2 02/12] NFC: st21nfca: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 03/12] NFC: st21nfca: Get rid of code duplication in ->probe() Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 04/12] NFC: fdp: Convert I2C driver to ->probe_new() Andy Shevchenko
2017-06-05 20:20 ` Andy Shevchenko [this message]
2017-06-05 20:20 ` [PATCH v2 06/12] NFC: fdp: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 07/12] NFC: st-nci: Get rid of platform data Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 08/12] NFC: st-nci: Get rid of "interesting" use of interrupt polarity Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 09/12] NFC: st-nci: Covert to use GPIO descriptor Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 10/12] NFC: st-nci: Use unified device property API meaningfully Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 11/12] NFC: st-nci: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-05 20:20 ` [PATCH v2 12/12] NFC: st-nci: Get rid of code duplication in ->probe() Andy Shevchenko
2017-06-12 15:36 ` [PATCH v2 00/12] NFC: clean up for ACPI GPIO usage Andy Shevchenko
2017-06-12 20:56 ` Samuel Ortiz
2017-06-13 8:41 ` Andy Shevchenko
2017-06-18 23:11 ` 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=20170605202009.78561-6-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-wireless@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;
as well as URLs for NNTP newsgroup(s).