From patchwork Mon Dec 10 20:54:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10722441 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 33B8C6C5 for ; Mon, 10 Dec 2018 20:55:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 238A42A33D for ; Mon, 10 Dec 2018 20:55:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1832A2A43D; Mon, 10 Dec 2018 20:55:04 +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,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67B242A33D for ; Mon, 10 Dec 2018 20:55:03 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 1E0FE267B2B; Mon, 10 Dec 2018 21:55:02 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 505EB267B2D; Mon, 10 Dec 2018 21:54:59 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by alsa0.perex.cz (Postfix) with ESMTP id C699C267AFE for ; Mon, 10 Dec 2018 21:54:56 +0100 (CET) Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MryKp-1hHusn2Rt7-00nyn0; Mon, 10 Dec 2018 21:54:48 +0100 From: Arnd Bergmann To: Jaroslav Kysela , Takashi Iwai , Connor McAdams , Takashi Sakamoto Date: Mon, 10 Dec 2018 21:54:25 +0100 Message-Id: <20181210205445.2913413-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:F4RDkWOdHd/Trvm9PYXyPHgh1AWbnLIVcutmzHJWoa1WND9rUTB g3h2yvlDzxCeMvXeLCBjyEQ0BR2w3QaJ7yxJPS5Ceg+50FH8n+I49MPmuOpJoW0ahnOao+x Pr0aF2CJ1k8TlPDoMFSTiDqRDvBBd3hvb6+Ql2Y9evFRVSV8pvPcmKXWwCCgEPSqVIoQGQp L/Wufo/qQdsMP3nBn7nRA== X-UI-Out-Filterresults: notjunk:1;V03:K0:mMzYYV3G32c=:up9mTc/mS2SmLgM2fa1OKu KY4ORKlrNHMD8KRVFuWui4tF8o4XPB9ot3L7EN+X3jaKO4lth/NaO4oFAkGBGN9QAZqNW0piW xSWAXWLwQATS5cSfOB9oDJQQV4gznI82DK8BSf4tXTEOqpM+pGjjYY4QsfFT6TM7YnqAi50QS cugq3FtuwKS2Ip3eYIHEPRRLSQCjj+zDEEie9BgEHUFPXK1eMxQRnwXTuzpsKh6+qfDId0so7 uxlje3fLAdhVi/+fcBpxhaQs8Fs7L05SPpOwSbG4Lpl/xdb8rTdwpthjg/tSLhLuHEDKJx4k/ ABW8I+QUYO/VErEAzeg84N/yH9dKpuCRhexUdCNZwK16KffjvDELlNl2DA5wdfAdjcEDa2gVP /Xss1gDhCjzXtDEYNXGeybaalmLzC0I5ZitSIyPz7lmXsS+GbA9mw7thhqQcGqQfQHR/J2g4t PliaYdTZ65D8PN+ZIZ9tOYgXcRP9k+01yOjrzyMcZkULf/ql+hS4KNgxbzRYbJ7ENStjWGQEZ GDIJL2X6rmDifSn0mnFkOQFXVnrGoKWz9InIow9Iu53O25OCBWRLBs4INfRKAnSpiK15ahiDY L4gzS/DxalL1U9LnDH+Aj+Z1rr6QYl7bMK3lGdTwFCJ/T+vDjdS03N/xeBu8aVuXIrmkkXHrQ svXeuI79T3yoUutclfyHUrc1eGfh06tNYwNOwlprEepruvVjf4/30ZtohaiwD4bt402Dczr6T MNT7am3lS3rp/uLFWIg/NpNGQCTSTFteO2BaCQ== Cc: alsa-devel@alsa-project.org, Alastair Bridgewater , linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [alsa-devel] [PATCH] ALSA: hda/ca0132 - make pci_iounmap() call conditional X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP When building without CONFIG_PCI, we can (depending on the architecture) get a link failure: ERROR: "pci_iounmap" [sound/pci/hda/snd-hda-codec-ca0132.ko] undefined! Adding a compile-time check for PCI gets it to work correctly on 32-bit ARM. Signed-off-by: Arnd Bergmann --- sound/pci/hda/patch_ca0132.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index c40cb6336017..e5bdbc245682 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -8451,7 +8451,7 @@ static void ca0132_free(struct hda_codec *codec) ca0132_exit_chip(codec); snd_hda_power_down(codec); - if (spec->mem_base) + if (IS_ENABLED(CONFIG_PCI) && spec->mem_base) pci_iounmap(codec->bus->pci, spec->mem_base); kfree(spec->spec_init_verbs); kfree(codec->spec);