diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-06-19 12:08:50 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2017-06-22 23:51:44 +0200 |
| commit | 7b9fcda91e18f13905e07f0145cc7efbe0e503dc (patch) | |
| tree | 763db1d7c107ccce22d83467afd33f8c142730b1 /drivers/nfc/fdp/i2c.c | |
| parent | NFC: fdp: Convert I2C driver to ->probe_new() (diff) | |
| download | linux-7b9fcda91e18f13905e07f0145cc7efbe0e503dc.tar.xz linux-7b9fcda91e18f13905e07f0145cc7efbe0e503dc.zip | |
NFC: fdp: Convert to use devres API
It looks like there are two leftovers, at least one of which can leak
the resource (IRQ).
Convert both places to use managed variants of the functions.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/fdp/i2c.c')
| -rw-r--r-- | drivers/nfc/fdp/i2c.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index 8a66b1845f27..c955f1f5139d 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -303,8 +303,7 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) return -ENODEV; } - phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy), - GFP_KERNEL); + phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy), GFP_KERNEL); if (!phy) return -ENOMEM; @@ -312,9 +311,10 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) phy->next_read_size = FDP_NCI_I2C_MIN_PAYLOAD; i2c_set_clientdata(client, phy); - r = request_threaded_irq(client->irq, NULL, fdp_nci_i2c_irq_thread_fn, - IRQF_TRIGGER_RISING | IRQF_ONESHOT, - FDP_I2C_DRIVER_NAME, phy); + r = devm_request_threaded_irq(dev, client->irq, + NULL, fdp_nci_i2c_irq_thread_fn, + IRQF_TRIGGER_RISING | IRQF_ONESHOT, + FDP_I2C_DRIVER_NAME, phy); if (r < 0) { nfc_err(&client->dev, "Unable to register IRQ handler\n"); |