NFC: st-nci: Use unified device properties API meaningfully

Use unified device properties API in meaningful way.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index 93a621e27d4e5c6d34b042e0514e4c4d3aea23f9..2ee381586f14738a4b92cd3c91d150349c9f8459 100644 (file)
--- 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 2834f698460879ac132e1fa73bad3e68aea8b3d9..383bf69163ef171f20624cbab0f3b57116ee57b8 100644 (file)
--- 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);