diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-06-19 13:08:46 +0300 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2017-06-22 23:51:44 +0200 |
| commit | 99f2064e15afcf81b5af22bc7c996cd5c182baf5 (patch) | |
| tree | fe5c9d13d984d4e88499c360360973bb70ff6ae2 /drivers/nfc | |
| parent | NFC: nfcmrvl: allow gpio 0 for reset signalling (diff) | |
| download | linux-dev-99f2064e15afcf81b5af22bc7c996cd5c182baf5.tar.xz linux-dev-99f2064e15afcf81b5af22bc7c996cd5c182baf5.zip | |
NFC: pn544: Switch to devm_acpi_dev_add_driver_gpios()
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify
error path and fix potentially wrong assignment if ->probe() fails.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/pn544/i2c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index fedde9d46ab6..4b14740edb67 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -904,7 +904,7 @@ static int pn544_hci_i2c_probe(struct i2c_client *client, phy->i2c_dev = client; i2c_set_clientdata(client, phy); - r = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), acpi_pn544_gpios); + r = devm_acpi_dev_add_driver_gpios(dev, acpi_pn544_gpios); if (r) dev_dbg(dev, "Unable to add GPIO mapping table\n"); @@ -958,7 +958,6 @@ static int pn544_hci_i2c_remove(struct i2c_client *client) if (phy->powered) pn544_hci_i2c_disable(phy); - acpi_dev_remove_driver_gpios(ACPI_COMPANION(&client->dev)); return 0; } |