lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] orinoco_pci: use pci_iomap() for resources

Browse Source 
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin
2006-04-07 04:10:53 -04:00
committed by John W. Linville
parent d62274b374
commit 3d52996221
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/wireless/orinoco_pci.c
View File

@@ -170,9 +170,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int err = 0; int err = 0;
unsigned long pci_iorange; void __iomem *pci_ioaddr = NULL;
u16 __iomem *pci_ioaddr = NULL;
unsigned long pci_iolen;
struct orinoco_private *priv = NULL; struct orinoco_private *priv = NULL;
struct orinoco_pci_card *card; struct orinoco_pci_card *card;
struct net_device *dev = NULL; struct net_device *dev = NULL;
@@ -190,10 +188,9 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
} }
/* Resource 0 is mapped to the hermes registers */ /* Resource 0 is mapped to the hermes registers */
pci_iorange = pci_resource_start(pdev, 0); pci_ioaddr = pci_iomap(pdev, 0, 0);
pci_iolen = pci_resource_len(pdev, 0); if (!pci_ioaddr) {
pci_ioaddr = ioremap(pci_iorange, pci_iolen); err = -EIO;
if (!pci_iorange) {
printk(KERN_ERR PFX "Cannot remap hardware registers\n"); printk(KERN_ERR PFX "Cannot remap hardware registers\n");
goto fail_map; goto fail_map;
} }
@@ -208,8 +205,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
priv = netdev_priv(dev); priv = netdev_priv(dev);
card = priv->card; card = priv->card;
card->pci_ioaddr = pci_ioaddr; card->pci_ioaddr = pci_ioaddr;
dev->mem_start = pci_iorange; dev->mem_start = pci_resource_start(pdev, 0);
dev->mem_end = pci_iorange + pci_iolen - 1; dev->mem_end = dev->mem_start + pci_resource_len(pdev, 0) - 1;
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);