From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Samuel Ortiz <sameo@linux.intel.com>,
linux-wireless@vger.kernel.org, linux-nfc@lists.01.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 01/13] NFC: pn544: Switch to devm_acpi_dev_add_driver_gpios()
Date: Mon, 19 Jun 2017 13:08:46 +0300 [thread overview]
Message-ID: <20170619100858.2655-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170619100858.2655-1-andriy.shevchenko@linux.intel.com>
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify
error path and fix potentially wrong assignment if ->probe() fails.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/nfc/pn544/i2c.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index fedde9d46ab6..4b14740edb67 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -904,7 +904,7 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
phy->i2c_dev = client;
i2c_set_clientdata(client, phy);
- r = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_pn544_gpios);
+ r = devm_acpi_dev_add_driver_gpios(dev, acpi_pn544_gpios);
if (r)
dev_dbg(dev, "Unable to add GPIO mapping table\n");
@@ -958,7 +958,6 @@ static int pn544_hci_i2c_remove(struct i2c_client *client)
if (phy->powered)
pn544_hci_i2c_disable(phy);
- acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev));
return 0;
}
--
2.11.0
next prev parent reply other threads:[~2017-06-19 10:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-19 10:08 [PATCH v3 00/13] NFC: clean up for ACPI GPIO usage Andy Shevchenko
2017-06-19 10:08 ` Andy Shevchenko [this message]
2017-06-19 10:08 ` [PATCH v3 02/13] NFC: st21nfca: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 03/13] NFC: st21nfca: Get rid of code duplication in ->probe() Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 04/13] NFC: fdp: Convert I2C driver to ->probe_new() Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 05/13] NFC: fdp: Convert to use devres API Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 06/13] NFC: fdp: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 07/13] NFC: st-nci: Get rid of platform data Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 08/13] NFC: st-nci: Get rid of "interesting" use of interrupt polarity Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 09/13] NFC: st-nci: Covert to use GPIO descriptor Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 10/13] NFC: st-nci: Use unified device properties API meaningfully Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 11/13] NFC: st-nci: Add GPIO ACPI mapping table Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 12/13] NFC: st-nci: Get rid of code duplication in ->probe() Andy Shevchenko
2017-06-19 10:08 ` [PATCH v3 13/13] MAINTAINERS: Remove non-existing NFC platform data files Andy Shevchenko
2017-06-22 21:55 ` [PATCH v3 00/13] NFC: clean up for ACPI GPIO usage 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=20170619100858.2655-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-nfc@lists.01.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.