From patchwork Wed Apr 19 22:10:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9689119 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CEB7D60375 for ; Wed, 19 Apr 2017 22:11:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C110C282E2 for ; Wed, 19 Apr 2017 22:11:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B3FB228433; Wed, 19 Apr 2017 22:11:58 +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=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72F44282E2 for ; Wed, 19 Apr 2017 22:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S940044AbdDSWLo (ORCPT ); Wed, 19 Apr 2017 18:11:44 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:60588 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765437AbdDSWLm (ORCPT ); Wed, 19 Apr 2017 18:11:42 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MFfu5-1cmNV82kVB-00EcDA; Thu, 20 Apr 2017 00:11:31 +0200 From: Arnd Bergmann To: Arend van Spriel Cc: Arnd Bergmann , Franky Lin , Hante Meuleman , Kalle Valo , Pieter-Paul Giesberts , "Michael S. Tsirkin" , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] brcmfmac: fix build without CONFIG_BRCMFMAC_PROTO_BCDC Date: Thu, 20 Apr 2017 00:10:24 +0200 Message-Id: <20170419221133.2180685-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:ULFq+APRb+T1aT9UEg5Sf6IoLJ2YQoOpkeUTnEpBOJvnIiij9HG 0bkGBFNqe3sPJZEFiBlF/25svwVp1gbZfgwwk8ZIbN4z5aSZocM1p620NROvNcBszbfeVeM Vvoij5nR6FhTxRkvWrtVZypi162LAWKiiLWrl3wdM4Sdy2yw5/LA5PR/3ZQ/yLiX4d7ukpY 3bMQLuSsh7q6pPk0HhSCw== X-UI-Out-Filterresults: notjunk:1; V01:K0:riMTA6xlBLo=:wjtk6sW/zd8Td3eg6Jkpxa R9GL+l/zgk+vKXmFif0tWbxPQlUbkDvbPHnwUJPWofzmjB+1ePF8rA+p+tCcn3Dh+vhKzBd0Q 5l6/Stat2lFhCYhFvieoXyQoV4ZewIn3Yum4H+mO/TnK/1sFOMhKSIbeh+4FhyindvOTvCa2Q vKjMTSbbM+Qcilxyy3ZxkCIX6GTBsTazWHfl5kwMYlaNEW2C70GDYyKaQD1Z+fS3luwXs1UW0 bhXTH+OWVWlNxodIftnrUVQhlaHP2FRMeQwtBM4FqoVBM7xCIJr+qc8E9tsWP1rQC4fh0MVec ATnkx+KtHpF8BSQe1QEFM3h+stvDHRKhUgnZKs56tS75F7pePfWDU3JzJLHJpRQhSjLVzCvDu rM7938dnscQf9QFi/qnqunqkWbPgZ4LNADQobLu3WHm+s2J0AFR0HT3Tc8VMBamdZ5MRa+Hp/ PmQItD5/mW96Ko1sIc1kKUJ45Ts7tleDv30N9eSAg+PCU+YUah9RCif0WPAzGGBF8nOqhsv2Z H/+3RFo+J7ZSHBDZbPhtkSGvPppDc3Rap4gF1Uphecjba85q2TQ7j/NdfVwVLin7/A4F7p9c2 4tolucuAGS+SICv7wuVEO7k0sWwGvnqQ790phMBIZ/7uOrHZVTLSqXJ555x/m8HbKqDsugMPP +HuZLG3xTh+4cq4YRn8ahV6Kd2SdiX3ajS7ZgPwhGi3hatYaSBHJa78QA4BEE6j0n4MA= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With CONFIG_BRCMFMAC_PROTO_BCDC unset, we cannot build the fwsignal.c file: drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c: In function 'brcmf_fws_notify_credit_map': drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c:1590:31: error: implicit declaration of function 'drvr_to_fws'; did you mean 'dev_to_psd'? [-Werror=implicit-function-declaration] struct brcmf_fws_info *fws = drvr_to_fws(ifp->drvr); drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c:1590:31: error: initialization makes pointer from integer without a cast [-Werror=int-conversion] drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c:1621:31: error: initialization makes pointer from integer without a cast [-Werror=int-conversion] However, as pointed out in the changeset description for the patch that caused the problem, fwsignal.c is only required when CONFIG_BRCMFMAC_PROTO_BCDC is enabled, so we can simply change the Makefile to build it conditionally. Fixes: acf8ac41dd73 ("brcmfmac: remove reference to fwsignal data from struct brcmf_pub") Signed-off-by: Arnd Bergmann --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile index 0383ba559edc..1f5a9b948abf 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile @@ -25,7 +25,6 @@ brcmfmac-objs += \ chip.o \ fwil.o \ fweh.o \ - fwsignal.o \ p2p.o \ proto.o \ common.o \ @@ -36,7 +35,8 @@ brcmfmac-objs += \ vendor.o \ pno.o brcmfmac-$(CONFIG_BRCMFMAC_PROTO_BCDC) += \ - bcdc.o + bcdc.o \ + fwsignal.o brcmfmac-$(CONFIG_BRCMFMAC_PROTO_MSGBUF) += \ commonring.o \ flowring.o \