UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tg3: Use pci_ioremap_bar() 

This patch replaces the existing APE register mapping code with a call
to pci_ioremap_bar().  The code that maps the main device register space
did not undergo a similar change because the information derived from
the pci_resource_start() and pci_resource_len() is still used to
populate the (optional) mem_start and mem_end netdevice members.
Replace hardcoded constants where appropriate.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Carlson 2008-11-03 16:49:57 -08:00 committed by David S. Miller
parent c88e668b52
commit 63532394af
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/tg3.c
View File

@ -54,6 +54,9 @@
#include <asm/prom.h> #include <asm/prom.h>
#endif #endif
#define BAR_0 0
#define BAR_2 2
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#define TG3_VLAN_TAG_USED 1 #define TG3_VLAN_TAG_USED 1
#else #else
@ -13247,8 +13250,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
static int tg3_version_printed = 0; static int tg3_version_printed = 0;
resource_size_t tg3reg_base; resource_size_t tg3reg_len;
unsigned long tg3reg_len;
struct net_device *dev; struct net_device *dev;
struct tg3 *tp; struct tg3 *tp;
int err, pm_cap; int err, pm_cap;
@ -13265,7 +13267,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
return err; return err;
} }
if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) { if (!(pci_resource_flags(pdev, BAR_0) & IORESOURCE_MEM)) {
printk(KERN_ERR PFX "Cannot find proper PCI device " printk(KERN_ERR PFX "Cannot find proper PCI device "
"base address, aborting.\n"); "base address, aborting.\n");
err = -ENODEV; err = -ENODEV;
@ -13290,9 +13292,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
goto err_out_free_res; goto err_out_free_res;
} }
tg3reg_base = pci_resource_start(pdev, 0);
tg3reg_len = pci_resource_len(pdev, 0);
dev = alloc_etherdev(sizeof(*tp)); dev = alloc_etherdev(sizeof(*tp));
if (!dev) { if (!dev) {
printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n"); printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
@ -13344,7 +13343,11 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
spin_lock_init(&tp->indirect_lock); spin_lock_init(&tp->indirect_lock);
INIT_WORK(&tp->reset_task, tg3_reset_task); INIT_WORK(&tp->reset_task, tg3_reset_task);
tp->regs = ioremap_nocache(tg3reg_base, tg3reg_len); dev->mem_start = pci_resource_start(pdev, BAR_0);
tg3reg_len = pci_resource_len(pdev, BAR_0);
dev->mem_end = dev->mem_start + tg3reg_len;
tp->regs = ioremap_nocache(dev->mem_start, tg3reg_len);
if (!tp->regs) { if (!tp->regs) {
printk(KERN_ERR PFX "Cannot map device registers, " printk(KERN_ERR PFX "Cannot map device registers, "
"aborting.\n"); "aborting.\n");
@ -13467,17 +13470,14 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
} }
if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) { if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) {
if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM)) { if (!(pci_resource_flags(pdev, BAR_2) & IORESOURCE_MEM)) {
printk(KERN_ERR PFX "Cannot find proper PCI device " printk(KERN_ERR PFX "Cannot find proper PCI device "
"base address for APE, aborting.\n"); "base address for APE, aborting.\n");
err = -ENODEV; err = -ENODEV;
goto err_out_iounmap; goto err_out_iounmap;
} }
tg3reg_base = pci_resource_start(pdev, 2); tp->aperegs = pci_ioremap_bar(pdev, BAR_2);
tg3reg_len = pci_resource_len(pdev, 2);
tp->aperegs = ioremap_nocache(tg3reg_base, tg3reg_len);
if (!tp->aperegs) { if (!tp->aperegs) {
printk(KERN_ERR PFX "Cannot map APE registers, " printk(KERN_ERR PFX "Cannot map APE registers, "
"aborting.\n"); "aborting.\n");