From aab25e62dd6c80557bc98064ce2ffa665ab1337c Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Fri, 26 Aug 2011 15:19:36 +0200 Subject: [PATCH] --- yaml --- r: 268023 b: refs/heads/master c: b6f29edecd95f2eb4715e9d1778688eb1a44c83c h: refs/heads/master i: 268021: 12cba1f6271ac220ec39604f824ab19fb900912e 268019: c271123a491fc96ef84ba350ec54bda7186358fa 268015: 600ade8a83bdb4aebe5023476e931e49eb219f8f v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1b4fa1af7b44..14cb4ffe1c43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5a44c8ad3378e88a5a14e1f74495c292a755527 +refs/heads/master: b6f29edecd95f2eb4715e9d1778688eb1a44c83c diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c index 237017186131..9b787e6c0880 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c @@ -752,12 +752,11 @@ static int brcms_set_hint(struct brcms_info *wl, char *abbrev) * is called in brcms_pci_probe() context, therefore no locking required. */ static struct brcms_info *brcms_attach(u16 vendor, u16 device, - unsigned long regs, + resource_size_t regs, struct pci_dev *btparam, uint irq) { struct brcms_info *wl = NULL; int unit, err; - unsigned long base_addr; struct ieee80211_hw *hw; u8 perm[ETH_ALEN]; @@ -780,11 +779,7 @@ static struct brcms_info *brcms_attach(u16 vendor, u16 device, /* setup the bottom half handler */ tasklet_init(&wl->tasklet, brcms_dpc, (unsigned long) wl); - - - base_addr = regs; - - wl->regsva = ioremap_nocache(base_addr, PCI_BAR0_WINSZ); + wl->regsva = ioremap_nocache(regs, PCI_BAR0_WINSZ); if (wl->regsva == NULL) { wiphy_err(wl->wiphy, "wl%d: ioremap() failed\n", unit); goto fail;