From patchwork Wed Oct 17 18:50:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10645993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A76A17D4 for ; Wed, 17 Oct 2018 18:52:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C961288F8 for ; Wed, 17 Oct 2018 18:52:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60264287C6; Wed, 17 Oct 2018 18:52:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3BADD28923 for ; Wed, 17 Oct 2018 18:52:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=0AhZqI3kgLOIPb0hjj9xU+ArC3uJMmpr9yGjlAWDJXo=; b=pVu GaFM6avmi3sojcIjmafDYdfTVVaDwwHwbWAEUAmC8AocwRoNNF3QVZHO28O6zZMVdrNanD/nVi7Hz 5nouLQPYCIFN1OC6fI2UoUbwAkKk2q2Y+DhBAFxihUouluiRxbrHoEWmn/rCekBZeEtm1EnWu6Lxm Mwd1GzADVeIOxIIUA4+W+/DLqcbGiVTMs9e+m5koq1IT3GJaCFa6/za2cmyelvnFrHAkeClZAmP2z HBGXTQy95s3tSGLXzMLRupWvoCareY9LQXkBkj2fy4KR3iDFSN6KNk891U50xCmzYpxUCbGkLPzqI fCDOlcMnIYYkXJkWyfgz/bwB6W4iQDg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gCqvD-0004C6-CR; Wed, 17 Oct 2018 18:51:55 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gCqv7-0004Am-1l for linux-arm-kernel@lists.infradead.org; Wed, 17 Oct 2018 18:51:51 +0000 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mlvr3-1flWq10umZ-00j1sz; Wed, 17 Oct 2018 20:51:30 +0200 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mlvr3-1flWq10umZ-00j1sz; Wed, 17 Oct 2018 20:51:30 +0200 From: Arnd Bergmann To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown Subject: [PATCH] spi: pxa2xx: fix PCI dependency Date: Wed, 17 Oct 2018 20:50:52 +0200 Message-Id: <20181017185128.2634666-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:Lk9D7S/uTiR88GE592s9OY8762St2G7Rp0iKSykQfhkboZLOjkx RogAee+KtRqeCppjwHsxkKJdl/XYuwDJdbjcE5FgTj5huPGiK3gqElDpIAwKl8Nn6EnyPL/ YSl/kDo8KOgfiGBFF8mVk/RxHUv120NhK2Ofxd3O4kMa7N+nFMdsuRCE5Fi45WLY1ylDGTb KRGBE0ARB/MDS6kL63UyQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:lc5GyvfVigE=:7RAA9k9uRilBjNaX3ej9wF wLpxsgCo0rc653x5KZh5VVDD4lpCNch1DQ/Sx9sBEZnBsSOjFN+YVhwxqGyG2D/9HeaMzSYzn vc99ZGVNnCBrURfxY+UQlherpLoc7EwsV8w2qzBL38BhMujhUCsalOLBGeTUOSEyT147jRu/4 fiLXLWzX4u2wReY+qCk+SE/dyj/pIT7DA9cUx4RSaXQ3D46nAqSUrBX9j6ylXeHsq29wtHvl2 Rt61RXYwhz/ZQ4l9dmKb+vtVH+ovylLkj46GdmLXeF/psY4MNxWTSHYS9CYXNVtnu2/Hcg+4j 7bPc2ZWyJoElB3ySyA65WLBCs4t1zPerj8J7HhsWidb5GUqE3MzpZ7l5hi/Ma3q9aWm6ovnjz IgWHljzqR4+M0wd6v/zmzWf86Pr9+89VEMHxqSmAiAbuKlNYTn9Q1c8oLeJxVNFdwqYGcFGxG A/gh09Xp8ChcST6m8PuLabM9CgtooNzlGBlUZ+j6I1euFtqOSAHiIBLh9Opsn+UKDfF6AQIx1 Pt7+pGzQtD7MRnT7/MFEC6tJO6jjS1iS7aPPH179r1ZmkGQOgdC35Hgg5zK5CbVviTP9ixn+k YBhbdxHSZgQpaXWMk4yL/YihAyqlX84ciQFiWtxmvKj/x8nUTxEgZ5I/JoXkjxE8pX9AV2sZf IergDRL3fLhajeJoSoVWwqa9SrsuzUbE80KDEojgvtTa3dSYvwrQ/Tzs5MZtC5VBEDgk= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181017_115149_424614_24CF7342 X-CRM114-Status: UNSURE ( 9.48 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Lubomir Rintel , Jarkko Nikula , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The code reorganization broke building without CONFIG_PCI: drivers/spi/spi-pxa2xx.c: In function 'pxa2xx_spi_init_pdata': drivers/spi/spi-pxa2xx.c:1457:15: error: implicit declaration of function 'pci_match_id'; did you mean 'pci_map_sg'? [-Werror=implicit-function-declaration] Add back an #ifdef around the code block that requires it. Fixes: 87ae1d2d7077 ("spi: pxa2xx: Add devicetree support") Signed-off-by: Arnd Bergmann --- drivers/spi/spi-pxa2xx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 612cc49db28f..c1c30109dd1f 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1453,9 +1453,11 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) if (pdev->dev.of_node) of_id = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev); +#ifdef CONFIG_PCI else if (dev_is_pci(pdev->dev.parent)) pcidev_id = pci_match_id(pxa2xx_spi_pci_compound_match, to_pci_dev(pdev->dev.parent)); +#endif else if (adev) adev_id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev);