]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
nfc: s3fwrn5: let core configure the interrupt trigger
authorKrzysztof Kozlowski <krzk@kernel.org>
Thu, 10 Dec 2020 21:18:24 +0000 (22:18 +0100)
committerJakub Kicinski <kuba@kernel.org>
Sat, 12 Dec 2020 23:02:39 +0000 (15:02 -0800)
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>
drivers/nfc/s3fwrn5/i2c.c

index 42f1f610ac2c1cf3f7f0a74c21133071e3309a6e..897394167522921e58cfd8ed5be1b2906655d9e2 100644 (file)
@@ -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);