Skip to content

Commit

Permalink
NFC: st21nfca: Use unified device property API meaningfully
Browse files Browse the repository at this point in the history
Another place in the code that unveils non-tested at all ACPI case.

Use unified device property API in meaningful way.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Andy Shevchenko authored and Samuel Ortiz committed Apr 5, 2017
1 parent 8d3c50e commit 682fd61
Showing 1 changed file with 5 additions and 24 deletions.
29 changes: 5 additions & 24 deletions drivers/nfc/st21nfca/i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,6 @@ static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)
{
struct st21nfca_i2c_phy *phy = i2c_get_clientdata(client);
struct device *dev = &client->dev;
u8 tmp;

/* Get EN GPIO from ACPI */
phy->gpiod_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 1,
Expand All @@ -515,31 +514,13 @@ static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)
return PTR_ERR(phy->gpiod_ena);
}

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;
}

static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
{
struct st21nfca_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_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 0,
Expand All @@ -549,11 +530,6 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
return PTR_ERR(phy->gpiod_ena);
}

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;
}

Expand Down Expand Up @@ -603,6 +579,11 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client,
return -ENODEV;
}

phy->se_status.is_ese_present =
device_property_read_bool(&client->dev, "ese-present");
phy->se_status.is_uicc_present =
device_property_read_bool(&client->dev, "uicc-present");

r = st21nfca_hci_platform_init(phy);
if (r < 0) {
nfc_err(&client->dev, "Unable to reboot st21nfca\n");
Expand Down

0 comments on commit 682fd61

Please sign in to comment.