diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2009-08-07 15:02:00 -0700 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2009-09-18 08:39:01 +0000 |
| commit | d1833c21256e7b0ac3997493d31f0f3926f6d592 (patch) | |
| tree | caffb6f9800632545fefaa0db81f4fc957bdba89 /drivers/watchdog | |
| parent | 119d3e56e7c82a73d27b5dd010c52dab1bc9f846 (diff) | |
| download | linux-d1833c21256e7b0ac3997493d31f0f3926f6d592.tar.gz | |
[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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/wdt_pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 02b6bdaa2dee..f368dd87083a 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c @@ -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 */ |