Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1833c21 authored by Randy Dunlap's avatar Randy Dunlap Committed by Wim Van Sebroeck
Browse files

[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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 119d3e56

drivers/watchdog/wdt_pci.c

+5 −5
Original line number Diff line number Diff line
@@ -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 */