From patchwork Thu Jul 14 21:29:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franky Lin X-Patchwork-Id: 976242 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6ELVb2r020200 for ; Thu, 14 Jul 2011 21:31:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932471Ab1GNVbc (ORCPT ); Thu, 14 Jul 2011 17:31:32 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:4277 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932382Ab1GNV34 (ORCPT ); Thu, 14 Jul 2011 17:29:56 -0400 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 14 Jul 2011 14:34:50 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Thu, 14 Jul 2011 14:29:23 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id C801574D07; Thu, 14 Jul 2011 14:29:36 -0700 (PDT) Received: from lc-sj1-3560.broadcom.com (lc-sj1-3560.sj.broadcom.com [10.17.194.250]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id E69772051C; Thu, 14 Jul 2011 14:29:33 -0700 (PDT) Received: by lc-sj1-3560.broadcom.com (Postfix, from userid 25250) id 6ACEF2C19D21; Thu, 14 Jul 2011 14:29:31 -0700 (PDT) From: "Franky Lin" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 22/35] staging: brcm80211: fix for checkpatch 'avoid externs in c file' warning Date: Thu, 14 Jul 2011 14:29:18 -0700 Message-ID: <1310678971-28952-23-git-send-email-frankyl@broadcom.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1310678971-28952-1-git-send-email-frankyl@broadcom.com> References: <1310678971-28952-1-git-send-email-frankyl@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 6201BF733B420695917-04-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Jul 2011 21:31:37 +0000 (UTC) From: Roland Vossen Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Franky Lin --- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 10 ++-------- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 4 ++-- drivers/staging/brcm80211/brcmfmac/sdio_host.h | 1 + drivers/staging/brcm80211/brcmsmac/main.c | 3 +-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index f4e72ed..fb3ab63 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -103,16 +103,8 @@ static struct brcmf_sdioh_driver drvinfo = { NULL, NULL }; module_param(sd_msglevel, uint, 0); -extern uint sd_f2_blocksize; module_param(sd_f2_blocksize, int, 0); -/* forward declarations */ -int brcmf_sdio_probe(struct device *dev); -EXPORT_SYMBOL(brcmf_sdio_probe); - -int brcmf_sdio_remove(struct device *dev); -EXPORT_SYMBOL(brcmf_sdio_remove); - struct brcmf_sdio_card* brcmf_sdcard_attach(void *cfghdl, u32 *regsva, uint irq) { @@ -590,6 +582,7 @@ err: return -ENODEV; } +EXPORT_SYMBOL(brcmf_sdio_probe); int brcmf_sdio_remove(struct device *dev) { @@ -619,6 +612,7 @@ int brcmf_sdio_remove(struct device *dev) kfree(sdhc); return 0; } +EXPORT_SYMBOL(brcmf_sdio_remove); int brcmf_sdio_register(struct brcmf_sdioh_driver *driver) { diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 310a96f..9ee566c 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -422,7 +422,7 @@ static int _brcmf_set_mac_address(struct brcmf_info *drvr_priv, int ifidx, u8 *a } #ifdef SOFTAP -extern struct net_device *ap_net_dev; +static struct net_device *ap_net_dev; #endif /* Virtual interfaces only ((ifp && ifp->info && ifp->idx == true) */ @@ -468,7 +468,7 @@ static void brcmf_op_if(struct brcmf_if *ifp) #ifdef SOFTAP /* semaphore that the soft AP CODE waits on */ - extern struct semaphore ap_eth_sema; + struct semaphore ap_eth_sema; /* save ptr to wl0.1 netdev for use in wl_iw.c */ diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h index d345472..ad67955 100644 --- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h @@ -341,6 +341,7 @@ extern int brcmf_sdioh_abort(struct sdioh_info *si, uint fnc); extern void brcmf_sdio_wdtmr_enable(bool enable); extern uint sd_msglevel; /* Debug message level */ +extern uint sd_f2_blocksize; extern struct brcmf_sdmmc_instance *gInstance; diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c index ec3a4db..85d161c 100644 --- a/drivers/staging/brcm80211/brcmsmac/main.c +++ b/drivers/staging/brcm80211/brcmsmac/main.c @@ -3552,8 +3552,7 @@ void brcms_c_switch_shortslot(struct brcms_c_info *wlc, bool shortslot) if (wlc->shortslot) cfg->current_bss->capability |= WLAN_CAPABILITY_SHORT_SLOT_TIME; - END_FOREACH_BSS - + END_FOREACH_BSS /* this comment fixes a checkpatch warning */ brcms_b_set_shortslot(wlc->hw, shortslot); }