diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-06-19 12:08:55 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2017-06-22 23:51:45 +0200 |
| commit | 75719b2b7a03729f403aed55bec938c6d2784690 (patch) | |
| tree | 3e040dafe17c6eb3809e93c4d77ee7042a807d4a /drivers/nfc/st-nci/i2c.c | |
| parent | NFC: st-nci: Covert to use GPIO descriptor (diff) | |
| download | linux-75719b2b7a03729f403aed55bec938c6d2784690.tar.xz linux-75719b2b7a03729f403aed55bec938c6d2784690.zip | |
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>
Diffstat (limited to 'drivers/nfc/st-nci/i2c.c')
| -rw-r--r-- | drivers/nfc/st-nci/i2c.c | 30 |
1 files changed, 6 insertions, 24 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); |