Skip to contentSkip to conversation

NFC: nxp-nci: Fix probing without ACPI

PATCH In review Stephan Gerhold 3 participants 3 messages Dec 9, 2019 – Dec 10, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 NFC: nxp-nci: Fix probing without ACPI

devm_acpi_dev_add_driver_gpios() returns -ENXIO if CONFIG_ACPI is disabled (e.g. on device tree platforms).
In this case, nxp-nci will silently fail to probe.

The other NFC drivers only log a debug message if
devm_acpi_dev_add_driver_gpios() fails.
Do the same in nxp-nci to fix this problem.

Fixes ad0acfd69add ("NFC: nxp-nci: Get rid of code duplication in ->probe()")
Cc Andy Shevchenko <[email protected]>
---
 drivers/nfc/nxp-nci/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/nxp-nci/i2c.c +1 -1
index 4d1909aecd6c..9f60e4dc5a90 100644
@@ -278,7 +278,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,
 
 	r = devm_acpi_dev_add_driver_gpios(dev, acpi_nxp_nci_gpios);
 	if (r)
-		return r;
+		dev_dbg(dev, "Unable to add GPIO mapping table\n");
 
 	phy->gpiod_en = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
 	if (IS_ERR(phy->gpiod_en)) {
Signature · 1 line
2.24.0
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Stephan Gerhold

devm_acpi_dev_add_driver_gpios() returns -ENXIO if CONFIG_ACPI is disabled (e.g. on device tree platforms).
In this case, nxp-nci will silently fail to probe.

The other NFC drivers only log a debug message if
devm_acpi_dev_add_driver_gpios() fails.
Do the same in nxp-nci to fix this problem.

Ah, thanks!

Quoted 23 lines
Fixes ad0acfd69add ("NFC: nxp-nci: Get rid of code duplication in ->probe()")
Cc Andy Shevchenko <[email protected]>
---
 drivers/nfc/nxp-nci/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/nxp-nci/i2c.c +1 -2
index 4d1909aecd6c..9f60e4dc5a90 100644
@@ -278,7 +278,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client,
 
        r = devm_acpi_dev_add_driver_gpios(dev, acpi_nxp_nci_gpios);
        if (r)
-               return r;
+               dev_dbg(dev, "Unable to add GPIO mapping table\n");
 
        phy->gpiod_en = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW);
        if (IS_ERR(phy->gpiod_en)) {
--

2.24.0

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#2 lore raw
In reply to Stephan Gerhold

From: Stephan Gerhold <[email protected]>
Date: Mon, 9 Dec 2019 19:53:43 +0100

Quoted 11 lines

devm_acpi_dev_add_driver_gpios() returns -ENXIO if CONFIG_ACPI is disabled (e.g. on device tree platforms).
In this case, nxp-nci will silently fail to probe.

The other NFC drivers only log a debug message if
devm_acpi_dev_add_driver_gpios() fails.
Do the same in nxp-nci to fix this problem.

Fixes ad0acfd69add ("NFC: nxp-nci: Get rid of code duplication in ->probe()")
Cc Andy Shevchenko <[email protected]>

Applied and queued up for v5.4 -stable, thanks.