| Message ID | 20191209185343.215893-1-stephan@gerhold.net |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | NFC: nxp-nci: Fix probing without ACPI | expand |
On Mon, Dec 9, 2019 at 8:57 PM Stephan Gerhold <stephan@gerhold.net> wrote: > > 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! Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Fixes: ad0acfd69add ("NFC: nxp-nci: Get rid of code duplication in ->probe()") > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- > drivers/nfc/nxp-nci/i2c.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c > index 4d1909aecd6c..9f60e4dc5a90 100644 > --- a/drivers/nfc/nxp-nci/i2c.c > +++ b/drivers/nfc/nxp-nci/i2c.c > @@ -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 >
From: Stephan Gerhold <stephan@gerhold.net> Date: Mon, 9 Dec 2019 19:53:43 +0100 > 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 <andriy.shevchenko@linux.intel.com> > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Applied and queued up for v5.4 -stable, thanks.
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index 4d1909aecd6c..9f60e4dc5a90 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -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)) {
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 <andriy.shevchenko@linux.intel.com> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- drivers/nfc/nxp-nci/i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)