---

yaml --- r: 118415 b: refs/heads/master c: 19ecb6b h: refs/heads/master i: 118413: 01cf09f 118411: 55f5533 118407: d2248c6 118399: ca602c6 v: v3
git-mirror · Nov 4, 2008 · bb4b6dd · bb4b6dd
1 parent 32034de
commit bb4b6dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca8eac55fa554043c57fd18d595ca356e752833e
+refs/heads/master: 19ecb6ba800765743bb4525c66562f0d30993f8d
diff --git a/trunk/drivers/net/niu.c b/trunk/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");