From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18897C3F68F for ; Fri, 27 Dec 2019 17:55:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEADB2173E for ; Fri, 27 Dec 2019 17:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469354; bh=xliATFxaIc+DI3oWcgq4jydwYRh7rKbWojHiLvFhSpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lrLJ8i0CaU+kGeMJ0umbHSZZx31fo9tbYJY1qpy1P6Izj2BCEoUm6i/Vvz5TZJJY0 xrxfIRnU4Xy29icusGzBTQzTemLLE1COAin7FVVDfsVYK8XMANUL28HUuehg3Pl5nK 5r4+2weSEKwehX1o56Upraf19najLhuBTx7qwAew= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727757AbfL0RmJ (ORCPT ); Fri, 27 Dec 2019 12:42:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:38704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727733AbfL0RmE (ORCPT ); Fri, 27 Dec 2019 12:42:04 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 21C4A2173E; Fri, 27 Dec 2019 17:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577468524; bh=xliATFxaIc+DI3oWcgq4jydwYRh7rKbWojHiLvFhSpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tv6Dh7QMt+OsieBq8OIoF160UvRlxBzUvTd3wUxj6J/LgWqcj9yYLAkpgybcOvsJh gA7t5mdDcjDkuZuC1ZGPbjLnsvueAs7h2f2ah8UpYYmebdbOjmnWdxGRaWsYpMJI4e rfoHc6u7D+fLLYFNx2C+FNKfpjRYcQow0rPn+H2k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stephan Gerhold , Andy Shevchenko , Andy Shevchenko , "David S . Miller" , Sasha Levin , linux-nfc@lists.01.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 055/187] NFC: nxp-nci: Fix probing without ACPI Date: Fri, 27 Dec 2019 12:38:43 -0500 Message-Id: <20191227174055.4923-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227174055.4923-1-sashal@kernel.org> References: <20191227174055.4923-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stephan Gerhold [ Upstream commit 868afbaca1e2a7923e48b5e8c07be34660525db5 ] 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 Signed-off-by: Stephan Gerhold Acked-by: Andy Shevchenko Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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.20.1