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 12/12] NFC: st-nci: Get rid of code duplication in ->probe()
Date: Mon, 5 Jun 2017 23:20:09 +0300 [thread overview]
Message-ID: <20170605202009.78561-13-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170605202009.78561-1-andriy.shevchenko@linux.intel.com>
Since OF and ACPI case almost the same get rid of code duplication
by moving gpiod_get() calls directly to ->probe().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/nfc/st-nci/i2c.c | 61 +++++++---------------------------------------
drivers/nfc/st-nci/spi.c | 63 ++++++++----------------------------------------
2 files changed, 19 insertions(+), 105 deletions(-)
diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index edda253b07fe..515f08d037fb 100644
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -210,41 +210,6 @@ static const struct acpi_gpio_mapping acpi_st_nci_gpios[] = {
{},
};
-static int st_nci_i2c_acpi_request_resources(struct i2c_client *client)
-{
- struct st_nci_i2c_phy *phy = i2c_get_clientdata(client);
- struct device *dev = &client->dev;
- int r;
-
- r = devm_acpi_dev_add_driver_gpios(dev, acpi_st_nci_gpios);
- if (r)
- return r;
-
- /* Get RESET GPIO from ACPI */
- phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
- if (IS_ERR(phy->gpiod_reset)) {
- nfc_err(dev, "Unable to get RESET GPIO\n");
- return -ENODEV;
- }
-
- return 0;
-}
-
-static int st_nci_i2c_of_request_resources(struct i2c_client *client)
-{
- struct st_nci_i2c_phy *phy = i2c_get_clientdata(client);
- struct device *dev = &client->dev;
-
- /* Get GPIO from device tree */
- phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
- if (IS_ERR(phy->gpiod_reset)) {
- nfc_err(dev, "Unable to get RESET GPIO\n");
- return PTR_ERR(phy->gpiod_reset);
- }
-
- return 0;
-}
-
static int st_nci_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -260,8 +225,7 @@ static int st_nci_i2c_probe(struct i2c_client *client,
return -ENODEV;
}
- phy = devm_kzalloc(&client->dev, sizeof(struct st_nci_i2c_phy),
- GFP_KERNEL);
+ phy = devm_kzalloc(dev, sizeof(struct st_nci_i2c_phy), GFP_KERNEL);
if (!phy)
return -ENOMEM;
@@ -269,21 +233,14 @@ static int st_nci_i2c_probe(struct i2c_client *client,
i2c_set_clientdata(client, phy);
- if (client->dev.of_node) {
- r = st_nci_i2c_of_request_resources(client);
- if (r) {
- nfc_err(&client->dev, "No platform data\n");
- return r;
- }
- } else if (ACPI_HANDLE(&client->dev)) {
- r = st_nci_i2c_acpi_request_resources(client);
- if (r) {
- nfc_err(&client->dev, "Cannot get ACPI data\n");
- return r;
- }
- } else {
- nfc_err(&client->dev,
- "st_nci platform resources not available\n");
+ r = devm_acpi_dev_add_driver_gpios(dev, acpi_st_nci_gpios);
+ if (r)
+ dev_dbg(dev, "Unable to add GPIO mapping table\n");
+
+ /* Get RESET GPIO */
+ phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
+ if (IS_ERR(phy->gpiod_reset)) {
+ nfc_err(dev, "Unable to get RESET GPIO\n");
return -ENODEV;
}
diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
index 80afdb9ea248..5be9fd326488 100644
--- a/drivers/nfc/st-nci/spi.c
+++ b/drivers/nfc/st-nci/spi.c
@@ -225,41 +225,6 @@ static const struct acpi_gpio_mapping acpi_st_nci_gpios[] = {
{},
};
-static int st_nci_spi_acpi_request_resources(struct spi_device *spi_dev)
-{
- struct st_nci_spi_phy *phy = spi_get_drvdata(spi_dev);
- struct device *dev = &spi_dev->dev;
- int r;
-
- r = devm_acpi_dev_add_driver_gpios(dev, acpi_st_nci_gpios);
- if (r)
- return r;
-
- /* Get RESET GPIO from ACPI */
- phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
- if (IS_ERR(phy->gpiod_reset)) {
- nfc_err(dev, "Unable to get RESET GPIO\n");
- return PTR_ERR(phy->gpiod_reset);
- }
-
- return 0;
-}
-
-static int st_nci_spi_of_request_resources(struct spi_device *dev)
-{
- struct st_nci_spi_phy *phy = spi_get_drvdata(dev);
- struct device *dev = &dev->dev;
-
- /* Get GPIO from device tree */
- phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
- if (IS_ERR(phy->gpiod_reset)) {
- nfc_err(dev, "Unable to get RESET GPIO\n");
- return PTR_ERR(phy->gpiod_reset);
- }
-
- return 0;
-}
-
static int st_nci_spi_probe(struct spi_device *dev)
{
struct st_nci_spi_phy *phy;
@@ -275,8 +240,7 @@ static int st_nci_spi_probe(struct spi_device *dev)
return -ENODEV;
}
- phy = devm_kzalloc(&dev->dev, sizeof(struct st_nci_spi_phy),
- GFP_KERNEL);
+ phy = devm_kzalloc(&dev->dev, sizeof(struct st_nci_spi_phy), GFP_KERNEL);
if (!phy)
return -ENOMEM;
@@ -284,22 +248,15 @@ static int st_nci_spi_probe(struct spi_device *dev)
spi_set_drvdata(dev, phy);
- if (dev->dev.of_node) {
- r = st_nci_spi_of_request_resources(dev);
- if (r) {
- nfc_err(&dev->dev, "No platform data\n");
- return r;
- }
- } else if (ACPI_HANDLE(&dev->dev)) {
- r = st_nci_spi_acpi_request_resources(dev);
- if (r) {
- nfc_err(&dev->dev, "Cannot get ACPI data\n");
- return r;
- }
- } else {
- nfc_err(&dev->dev,
- "st_nci platform resources not available\n");
- return -ENODEV;
+ r = devm_acpi_dev_add_driver_gpios(&dev->dev, acpi_st_nci_gpios);
+ if (r)
+ dev_dbg(&dev->dev, "Unable to add GPIO mapping table\n");
+
+ /* Get RESET GPIO */
+ phy->gpiod_reset = devm_gpiod_get(&dev->dev, "reset", GPIOD_OUT_HIGH);
+ if (IS_ERR(phy->gpiod_reset)) {
+ nfc_err(&dev->dev, "Unable to get RESET GPIO\n");
+ return PTR_ERR(phy->gpiod_reset);
}
phy->se_status.is_ese_present =
--
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 ` [PATCH v2 05/12] NFC: fdp: Convert to use devres API Andy Shevchenko
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 ` Andy Shevchenko [this message]
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-13-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).