Commit 99f2064e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Samuel Ortiz
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent e33a3f84

drivers/nfc/pn544/i2c.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

}