summaryrefslogtreecommitdiff
path: root/drivers/nfc/s3fwrn5
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2020-12-11 00:18:24 +0300
committerJakub Kicinski <kuba@kernel.org>2020-12-13 02:02:39 +0300
commite0a64d1dffca048a99546993322bd1fb5c728ee8 (patch)
tree927b36bb23945c8bae901641b9018b1751c3873e /drivers/nfc/s3fwrn5
parent771c8901568dd8776a260aa93db41be88a60389e (diff)
downloadlinux-e0a64d1dffca048a99546993322bd1fb5c728ee8.tar.xz
nfc: s3fwrn5: let core configure the interrupt trigger
If interrupt trigger is not set when requesting the interrupt, the core will take care of reading trigger type from Devicetree. There is no point to do it in the driver. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Link: https://lore.kernel.org/r/20201210211824.214949-1-krzk@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/nfc/s3fwrn5')
-rw-r--r--drivers/nfc/s3fwrn5/i2c.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c
index 42f1f610ac2c..897394167522 100644
--- a/drivers/nfc/s3fwrn5/i2c.c
+++ b/drivers/nfc/s3fwrn5/i2c.c
@@ -179,8 +179,6 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct s3fwrn5_i2c_phy *phy;
- struct irq_data *irq_data;
- unsigned long irqflags;
int ret;
phy = devm_kzalloc(&client->dev, sizeof(*phy), GFP_KERNEL);
@@ -214,11 +212,8 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client,
if (ret < 0)
return ret;
- irq_data = irq_get_irq_data(client->irq);
- irqflags = irqd_get_trigger_type(irq_data) | IRQF_ONESHOT;
-
ret = devm_request_threaded_irq(&client->dev, phy->i2c_dev->irq, NULL,
- s3fwrn5_i2c_irq_thread_fn, irqflags,
+ s3fwrn5_i2c_irq_thread_fn, IRQF_ONESHOT,
S3FWRN5_I2C_DRIVER_NAME, phy);
if (ret)
s3fwrn5_remove(phy->common.ndev);