From patchwork Wed Jun 29 23:47:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franky Lin X-Patchwork-Id: 930962 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 p5TNpBNI026604 for ; Wed, 29 Jun 2011 23:51:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758299Ab1F2Xuu (ORCPT ); Wed, 29 Jun 2011 19:50:50 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:1911 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758022Ab1F2Xsv (ORCPT ); Wed, 29 Jun 2011 19:48:51 -0400 Received: from [10.9.200.131] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Wed, 29 Jun 2011 16:53:30 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Wed, 29 Jun 2011 16:48:37 -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 74F6774D3B; Wed, 29 Jun 2011 16:48:32 -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 3DFB620533; Wed, 29 Jun 2011 16:48:26 -0700 (PDT) Received: by lc-sj1-3560.broadcom.com (Postfix, from userid 25250) id EF1C22C19D40; Wed, 29 Jun 2011 16:48:23 -0700 (PDT) From: "Franky Lin" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 058/119] staging: brcm80211: replaced typedef by struct for several sdio types Date: Wed, 29 Jun 2011 16:47:22 -0700 Message-ID: <1309391303-22741-59-git-send-email-frankyl@broadcom.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1309391303-22741-1-git-send-email-frankyl@broadcom.com> References: <1309391303-22741-1-git-send-email-frankyl@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 621565703B411334615-07-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]); Wed, 29 Jun 2011 23:51:12 +0000 (UTC) From: Roland Vossen Code cleanup. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Franky Lin --- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 16 +++++++--------- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 2 +- drivers/staging/brcm80211/brcmfmac/sdio_host.h | 6 +++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index 66d81d1..a2408ec 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -49,10 +49,8 @@ extern void brcmf_sdbrcm_isr(void *args); /** * SDIO Host Controller info */ -typedef struct bcmsdh_hc bcmsdh_hc_t; - struct bcmsdh_hc { - bcmsdh_hc_t *next; + struct bcmsdh_hc *next; #ifdef BCMPLATFORM_BUS struct device *dev; /* platform device handle */ #else @@ -69,10 +67,10 @@ struct bcmsdh_hc { spinlock_t irq_lock; #endif }; -static bcmsdh_hc_t *sdhcinfo; +static struct bcmsdh_hc *sdhcinfo; /* driver info, initialized when brcmf_sdio_register is called */ -static bcmsdh_driver_t drvinfo = { NULL, NULL }; +static struct brcmf_sdioh_driver drvinfo = { NULL, NULL }; /* debugging macros */ #define SDLX_MSG(x) @@ -142,7 +140,7 @@ static #endif /* BCMLXSDMMC */ int brcmf_sdio_probe(struct device *dev) { - bcmsdh_hc_t *sdhc = NULL; + struct bcmsdh_hc *sdhc = NULL; unsigned long regs = 0; struct brcmf_sdio *sdh = NULL; #if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS) @@ -176,7 +174,7 @@ int brcmf_sdio_probe(struct device *dev) } #endif /* defined(OOB_INTR_ONLY) */ /* allocate SDIO Host Controller state info */ - sdhc = kzalloc(sizeof(bcmsdh_hc_t), GFP_ATOMIC); + sdhc = kzalloc(sizeof(struct bcmsdh_hc), GFP_ATOMIC); if (!sdhc) { SDLX_MSG(("%s: out of memory\n", __func__)); goto err; @@ -236,7 +234,7 @@ static #endif /* BCMLXSDMMC */ int brcmf_sdio_remove(struct device *dev) { - bcmsdh_hc_t *sdhc, *prev; + struct bcmsdh_hc *sdhc, *prev; sdhc = sdhcinfo; drvinfo.detach(sdhc->ch); @@ -271,7 +269,7 @@ int brcmf_sdio_remove(struct device *dev) extern int brcmf_sdio_function_init(void); -int brcmf_sdio_register(bcmsdh_driver_t *driver) +int brcmf_sdio_register(struct brcmf_sdioh_driver *driver) { drvinfo = *driver; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 2ede425..c00f0f2 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -5632,7 +5632,7 @@ static void brcmf_sdbrcm_disconnect(void *ptr) * order to look for or await the device. */ -static bcmsdh_driver_t dhd_sdio = { +static struct brcmf_sdioh_driver dhd_sdio = { brcmf_sdbrcm_probe, brcmf_sdbrcm_disconnect }; diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h index c7d60ca..b7e0754 100644 --- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h @@ -201,16 +201,16 @@ extern int brcmf_sdcard_reset(struct brcmf_sdio *sdh); extern void *brcmf_sdcard_get_sdioh(struct brcmf_sdio *sdh); /* callback functions */ -typedef struct { +struct brcmf_sdioh_driver { /* attach to device */ void *(*attach) (u16 vend_id, u16 dev_id, u16 bus, u16 slot, u16 func, uint bustype, void *regsva, void *param); /* detach from device */ void (*detach) (void *ch); -} bcmsdh_driver_t; +}; /* platform specific/high level functions */ -extern int brcmf_sdio_register(bcmsdh_driver_t *driver); +extern int brcmf_sdio_register(struct brcmf_sdioh_driver *driver); extern void brcmf_sdio_unregister(void); extern bool brcmf_sdio_chipmatch(u16 vendor, u16 device); extern void brcmf_sdio_device_remove(void *sdh);