adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 03:06:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WATCHDOG] wdt_pci: fix printk and variable type

Browse source 
Fix printk format warning:
drivers/watchdog/wdt_pci.c:652: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'resource_size_t'

and then use resource_size_t for the "io" variable as well
so that it won't be truncated.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Randy Dunlap 2009-08-07 15:02:00 -07:00 committed by Wim Van Sebroeck
parent 119d3e56e7
commit d1833c2125
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/watchdog/wdt_pci.c
View file

@ -80,7 +80,7 @@ static unsigned long open_lock;
static DEFINE_SPINLOCK(wdtpci_lock);
static char expect_close;
static int io;
static resource_size_t io;
static int irq;
/* Default timeout */
@ -648,8 +648,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev,
}
if (pci_request_region(dev, 2, "wdt_pci")) {
printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
pci_resource_start(dev, 2));
printk(KERN_ERR PFX "I/O address 0x%llx already in use\n",
(unsigned long long)pci_resource_start(dev, 2));
goto out_pci;
}
@ -663,8 +663,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev,
}
printk(KERN_INFO
"PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%04x (Interrupt %d)\n",
io, irq);
"PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%llx (Interrupt %d)\n",
(unsigned long long)io, irq);
/* Check that the heartbeat value is within its range;
if not reset to the default */