[WATCHDOG] wdt_pci: fix printk and variable type
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:
parent
119d3e56e7
commit
d1833c2125
|
@ -80,7 +80,7 @@ static unsigned long open_lock;
|
||||||
static DEFINE_SPINLOCK(wdtpci_lock);
|
static DEFINE_SPINLOCK(wdtpci_lock);
|
||||||
static char expect_close;
|
static char expect_close;
|
||||||
|
|
||||||
static int io;
|
static resource_size_t io;
|
||||||
static int irq;
|
static int irq;
|
||||||
|
|
||||||
/* Default timeout */
|
/* Default timeout */
|
||||||
|
@ -648,8 +648,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pci_request_region(dev, 2, "wdt_pci")) {
|
if (pci_request_region(dev, 2, "wdt_pci")) {
|
||||||
printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
|
printk(KERN_ERR PFX "I/O address 0x%llx already in use\n",
|
||||||
pci_resource_start(dev, 2));
|
(unsigned long long)pci_resource_start(dev, 2));
|
||||||
goto out_pci;
|
goto out_pci;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -663,8 +663,8 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev,
|
||||||
}
|
}
|
||||||
|
|
||||||
printk(KERN_INFO
|
printk(KERN_INFO
|
||||||
"PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%04x (Interrupt %d)\n",
|
"PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%llx (Interrupt %d)\n",
|
||||||
io, irq);
|
(unsigned long long)io, irq);
|
||||||
|
|
||||||
/* Check that the heartbeat value is within its range;
|
/* Check that the heartbeat value is within its range;
|
||||||
if not reset to the default */
|
if not reset to the default */
|
||||||
|
|
Loading…
Reference in New Issue