summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-03 17:05:16 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-03 17:05:16 -0800
commit19ecb6ba800765743bb4525c66562f0d30993f8d (patch)
treed642aea28fdbace6c1dbacba72631b923002aa35
parentca8eac55fa554043c57fd18d595ca356e752833e (diff)
downloadblackbird-op-linux-19ecb6ba800765743bb4525c66562f0d30993f8d.tar.gz
blackbird-op-linux-19ecb6ba800765743bb4525c66562f0d30993f8d.zip
niu: Use pci_ioremap_bar().
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/niu.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index ebc812702903..9acb5d70a3ae 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -8667,7 +8667,6 @@ static void __devinit niu_device_announce(struct niu *np)
static int __devinit niu_pci_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
- unsigned long niureg_base, niureg_len;
union niu_parent_id parent_id;
struct net_device *dev;
struct niu *np;
@@ -8758,10 +8757,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM);
- niureg_base = pci_resource_start(pdev, 0);
- niureg_len = pci_resource_len(pdev, 0);
-
- np->regs = ioremap_nocache(niureg_base, niureg_len);
+ np->regs = pci_ioremap_bar(pdev, 0);
if (!np->regs) {
dev_err(&pdev->dev, PFX "Cannot map device registers, "
"aborting.\n");
OpenPOWER on IntegriCloud