summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-09-28 16:21:43 -0700
committerWim Van Sebroeck <wim@iguana.be>2008-10-24 07:47:24 +0000
commitaf4c293ffcdd76fc97469beb7d8861662232d92e (patch)
tree94bf7cdc09c25f846be913b6b3bd159920261108 /drivers/watchdog
parent57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff)
downloadlinux-next-af4c293ffcdd76fc97469beb7d8861662232d92e.tar.gz
[WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog
Use the newly introduced pci_ioremap_bar() function in drivers/watchdog. pci_ioremap_bar() just takes a pci device and a bar number, with the goal of making it really hard to get wrong, while also having a central place to stick sanity checks. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/i6300esb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index c13383f7fcb9..74f951c18b90 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -394,8 +394,7 @@ static unsigned char __init esb_getdevice(void)
goto err_disable;
}
- BASEADDR = ioremap(pci_resource_start(esb_pci, 0),
- pci_resource_len(esb_pci, 0));
+ BASEADDR = pci_ioremap_bar(esb_pci, 0);
if (BASEADDR == NULL) {
/* Something's wrong here, BASEADDR has to be set */
printk(KERN_ERR PFX "failed to get BASEADDR\n");