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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 917B2C3F68F for ; Sun, 29 Dec 2019 18:12:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 609A320748 for ; Sun, 29 Dec 2019 18:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643127; bh=SO80qTfhuuZnOKrR0zqMqmPghi9X1Dt0wB0Ee1DHsyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n05JzAulRK8iUh4w8oqoh4GvarWA4+LEg0+ihN5yAb0im52rCdrifCmSWf1qT42Ja 2PfjCK9fiwuhJlQNZTts7OrMm8aGmqwJBBU6/waU6wUdK4ULb4y7LmZJOT3MwIO943 u4xZ4uagLWgbSAbRb4mri+yBQ0RkmKNN8YxeNjbk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730289AbfL2RmZ (ORCPT ); Sun, 29 Dec 2019 12:42:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:48598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730285AbfL2RmY (ORCPT ); Sun, 29 Dec 2019 12:42:24 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1824A20718; Sun, 29 Dec 2019 17:42:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641343; bh=SO80qTfhuuZnOKrR0zqMqmPghi9X1Dt0wB0Ee1DHsyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=avqHkO0MKaEBJlkD339mMtDajMW/k15GqcDepOjKZzviJke1TywoNDSiYCeO9gpQm Tmm2zWZTIjz7LWdzVa4QnA4HT3wHxf9EpJ4Aoq3ZaevjZWZw3whyniFUf7HRjdPzqC IeCRejNEdgjpeuhmXGJPf4hTHgda2hKBkYn6PYI0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Shevchenko , Stephan Gerhold , Andy Shevchenko , "David S. Miller" Subject: [PATCH 5.4 027/434] NFC: nxp-nci: Fix probing without ACPI Date: Sun, 29 Dec 2019 18:21:20 +0100 Message-Id: <20191229172703.876687020@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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: Greg Kroah-Hartman --- drivers/nfc/nxp-nci/i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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_ 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)) {