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 10/13] NFC: st-nci: Use unified device properties API meaningfully
Date: Mon, 19 Jun 2017 13:08:55 +0300 [thread overview]
Message-ID: <20170619100858.2655-11-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20170619100858.2655-1-andriy.shevchenko@linux.intel.com>
Use unified device properties API in meaningful way.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/nfc/st-nci/i2c.c | 30 ++++++------------------------
drivers/nfc/st-nci/spi.c | 29 +++++------------------------
2 files changed, 11 insertions(+), 48 deletions(-)
diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index 93a621e27d4e..2ee381586f14 100644
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -209,7 +209,6 @@ 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;
- u8 tmp;
/* Get RESET GPIO from ACPI */
phy->gpiod_reset = devm_gpiod_get_index(dev, ST_NCI_GPIO_NAME_RESET,
@@ -219,19 +218,6 @@ static int st_nci_i2c_acpi_request_resources(struct i2c_client *client)
return -ENODEV;
}
- phy->se_status.is_ese_present = false;
- phy->se_status.is_uicc_present = false;
-
- if (device_property_present(dev, "ese-present")) {
- device_property_read_u8(dev, "ese-present", &tmp);
- phy->se_status.is_ese_present = tmp;
- }
-
- if (device_property_present(dev, "uicc-present")) {
- device_property_read_u8(dev, "uicc-present", &tmp);
- phy->se_status.is_uicc_present = tmp;
- }
-
return 0;
}
@@ -239,11 +225,6 @@ 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;
- struct device_node *pp;
-
- pp = client->dev.of_node;
- if (!pp)
- return -ENODEV;
/* Get GPIO from device tree */
phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
@@ -252,17 +233,13 @@ static int st_nci_i2c_of_request_resources(struct i2c_client *client)
return PTR_ERR(phy->gpiod_reset);
}
- phy->se_status.is_ese_present =
- of_property_read_bool(pp, "ese-present");
- phy->se_status.is_uicc_present =
- of_property_read_bool(pp, "uicc-present");
-
return 0;
}
static int st_nci_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
+ struct device *dev = &client->dev;
struct st_nci_i2c_phy *phy;
int r;
@@ -301,6 +278,11 @@ static int st_nci_i2c_probe(struct i2c_client *client,
return -ENODEV;
}
+ phy->se_status.is_ese_present =
+ device_property_read_bool(dev, "ese-present");
+ phy->se_status.is_uicc_present =
+ device_property_read_bool(dev, "uicc-present");
+
r = ndlc_probe(phy, &i2c_phy_ops, &client->dev,
ST_NCI_FRAME_HEADROOM, ST_NCI_FRAME_TAILROOM,
&phy->ndlc, &phy->se_status);
diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
index 2834f6984608..383bf69163ef 100644
--- a/drivers/nfc/st-nci/spi.c
+++ b/drivers/nfc/st-nci/spi.c
@@ -224,7 +224,6 @@ 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;
- u8 tmp;
/* Get RESET GPIO from ACPI */
phy->gpiod_reset = devm_gpiod_get_index(dev, ST_NCI_GPIO_NAME_RESET,
@@ -234,19 +233,6 @@ static int st_nci_spi_acpi_request_resources(struct spi_device *spi_dev)
return PTR_ERR(phy->gpiod_reset);
}
- phy->se_status.is_ese_present = false;
- phy->se_status.is_uicc_present = false;
-
- if (device_property_present(dev, "ese-present")) {
- device_property_read_u8(dev, "ese-present", &tmp);
- tmp = phy->se_status.is_ese_present;
- }
-
- if (device_property_present(dev, "uicc-present")) {
- device_property_read_u8(dev, "uicc-present", &tmp);
- tmp = phy->se_status.is_uicc_present;
- }
-
return 0;
}
@@ -254,11 +240,6 @@ static int st_nci_spi_of_request_resources(struct spi_device *spi)
{
struct st_nci_spi_phy *phy = spi_get_drvdata(spi);
struct device *dev = &spi->dev;
- struct device_node *pp;
-
- pp = spi->dev.of_node;
- if (!pp)
- return -ENODEV;
/* Get GPIO from device tree */
phy->gpiod_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
@@ -267,11 +248,6 @@ static int st_nci_spi_of_request_resources(struct spi_device *spi)
return PTR_ERR(phy->gpiod_reset);
}
- phy->se_status.is_ese_present =
- of_property_read_bool(pp, "ese-present");
- phy->se_status.is_uicc_present =
- of_property_read_bool(pp, "uicc-present");
-
return 0;
}
@@ -317,6 +293,11 @@ static int st_nci_spi_probe(struct spi_device *dev)
return -ENODEV;
}
+ phy->se_status.is_ese_present =
+ device_property_read_bool(&dev->dev, "ese-present");
+ phy->se_status.is_uicc_present =
+ device_property_read_bool(&dev->dev, "uicc-present");
+
r = ndlc_probe(phy, &spi_phy_ops, &dev->dev,
ST_NCI_FRAME_HEADROOM, ST_NCI_FRAME_TAILROOM,
&phy->ndlc, &phy->se_status);
--
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 ` [PATCH v3 01/13] NFC: pn544: Switch to devm_acpi_dev_add_driver_gpios() Andy Shevchenko
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 ` Andy Shevchenko [this message]
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-11-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 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).