Commit 8e7836d0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Samuel Ortiz

NFC: st21nfca: Get rid of "interesting" use of interrupt polarity

I2C framework followed by IRQ framework does set interrupt polarity
correctly if it's properly specified in firmware (ACPI or DT).

Get rid of the redundant trick when requesting interrupt.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 79557b33
...@@ -68,7 +68,6 @@ struct st21nfca_i2c_phy { ...@@ -68,7 +68,6 @@ struct st21nfca_i2c_phy {
struct nfc_hci_dev *hdev; struct nfc_hci_dev *hdev;
unsigned int gpio_ena; unsigned int gpio_ena;
unsigned int irq_polarity;
struct st21nfca_se_status se_status; struct st21nfca_se_status se_status;
...@@ -520,8 +519,6 @@ static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client) ...@@ -520,8 +519,6 @@ static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)
phy->gpio_ena = desc_to_gpio(gpiod_ena); phy->gpio_ena = desc_to_gpio(gpiod_ena);
phy->irq_polarity = irq_get_trigger_type(client->irq);
phy->se_status.is_ese_present = false; phy->se_status.is_ese_present = false;
phy->se_status.is_uicc_present = false; phy->se_status.is_uicc_present = false;
...@@ -566,8 +563,6 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client) ...@@ -566,8 +563,6 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
phy->gpio_ena = gpio; phy->gpio_ena = gpio;
phy->irq_polarity = irq_get_trigger_type(client->irq);
phy->se_status.is_ese_present = phy->se_status.is_ese_present =
of_property_read_bool(pp, "ese-present"); of_property_read_bool(pp, "ese-present");
phy->se_status.is_uicc_present = phy->se_status.is_uicc_present =
...@@ -630,7 +625,7 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client, ...@@ -630,7 +625,7 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client,
r = devm_request_threaded_irq(&client->dev, client->irq, NULL, r = devm_request_threaded_irq(&client->dev, client->irq, NULL,
st21nfca_hci_irq_thread_fn, st21nfca_hci_irq_thread_fn,
phy->irq_polarity | IRQF_ONESHOT, IRQF_ONESHOT,
ST21NFCA_HCI_DRIVER_NAME, phy); ST21NFCA_HCI_DRIVER_NAME, phy);
if (r < 0) { if (r < 0) {
nfc_err(&client->dev, "Unable to register IRQ handler\n"); nfc_err(&client->dev, "Unable to register IRQ handler\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment