summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorMichael Buesch <mbuesch@freenet.de>2006-03-18 20:19:12 +0100
committerJohn W. Linville <linville@tuxdriver.com>2006-03-27 11:19:40 -0500
commit4a1821e4c7a84569f788b7667affe2743317b63f (patch)
treefca9f5caf8554ae9dc16072b23273d10947e0f79 /drivers/net/wireless
parent5808bbbdf8c095745f0cac9110b245102243b243 (diff)
downloadop-kernel-dev-4a1821e4c7a84569f788b7667affe2743317b63f.zip
op-kernel-dev-4a1821e4c7a84569f788b7667affe2743317b63f.tar.gz
[PATCH] bcm43xx: remove check for mmio length, as it differs among platforms. (especially embedded)
Signed-off-by: Michael Buesch <mbuesch@freenet.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c30
1 files changed, 4 insertions, 26 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index e26507b..6a877df 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3386,23 +3386,17 @@ static int bcm43xx_attach_board(struct bcm43xx_private *bcm)
struct net_device *net_dev = bcm->net_dev;
int err;
int i;
- void __iomem *ioaddr;
- unsigned long mmio_start, mmio_end, mmio_flags, mmio_len;
+ unsigned long mmio_start, mmio_flags, mmio_len;
u32 coremask;
err = pci_enable_device(pci_dev);
if (err) {
printk(KERN_ERR PFX "unable to wake up pci device (%i)\n", err);
- err = -ENODEV;
goto out;
}
-
mmio_start = pci_resource_start(pci_dev, 0);
- mmio_end = pci_resource_end(pci_dev, 0);
mmio_flags = pci_resource_flags(pci_dev, 0);
mmio_len = pci_resource_len(pci_dev, 0);
-
- /* make sure PCI base addr is MMIO */
if (!(mmio_flags & IORESOURCE_MEM)) {
printk(KERN_ERR PFX
"%s, region #0 not an MMIO resource, aborting\n",
@@ -3410,39 +3404,23 @@ static int bcm43xx_attach_board(struct bcm43xx_private *bcm)
err = -ENODEV;
goto err_pci_disable;
}
-//FIXME: Why is this check disabled for BCM947XX? What is the IO_SIZE there?
-#ifndef CONFIG_BCM947XX
- if (mmio_len != BCM43xx_IO_SIZE) {
- printk(KERN_ERR PFX
- "%s: invalid PCI mem region size(s), aborting\n",
- pci_name(pci_dev));
- err = -ENODEV;
- goto err_pci_disable;
- }
-#endif
-
err = pci_request_regions(pci_dev, KBUILD_MODNAME);
if (err) {
printk(KERN_ERR PFX
"could not access PCI resources (%i)\n", err);
goto err_pci_disable;
}
-
/* enable PCI bus-mastering */
pci_set_master(pci_dev);
-
- /* ioremap MMIO region */
- ioaddr = ioremap(mmio_start, mmio_len);
- if (!ioaddr) {
+ bcm->mmio_addr = ioremap(mmio_start, mmio_len);
+ if (!bcm->mmio_addr) {
printk(KERN_ERR PFX "%s: cannot remap MMIO, aborting\n",
pci_name(pci_dev));
err = -EIO;
goto err_pci_release;
}
-
- net_dev->base_addr = (unsigned long)ioaddr;
- bcm->mmio_addr = ioaddr;
bcm->mmio_len = mmio_len;
+ net_dev->base_addr = (unsigned long)bcm->mmio_addr;
bcm43xx_pci_read_config16(bcm, PCI_SUBSYSTEM_VENDOR_ID,
&bcm->board_vendor);
OpenPOWER on IntegriCloud