linux-next: manual merge of the watchdog tree with the mfd tree

[Stephen Rothwell]

Hi Wim,

Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/iTCO_wdt.c between commit 887c8ec7219f ("watchdog:
Convert iTCO_wdt driver to mfd model") from the  tree and commit
c3614aa19d3e ("watchdog: iTCO_wdt.c: fix printk format warnings") from
the watchdog tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/watchdog/iTCO_wdt.c
index 741528b,2aab56f..0000000
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@@ -572,33 -837,32 +572,33 @@@ static int __devinit iTCO_wdt_probe(str
  	iTCO_wdt_set_NO_REBOOT_bit();
  
  	/* The TCO logic uses the TCO_EN bit in the SMI_EN register */
 -	if (!request_region(SMI_EN, 4, "iTCO_wdt")) {
 -		pr_err("I/O address 0x%04lx already in use, device disabled\n",
 +	if (!request_region(iTCO_wdt_private.smi_res->start,
 +			resource_size(iTCO_wdt_private.smi_res), dev->name)) {
 +		pr_err("I/O address 0x%04llx already in use, device disabled\n",
- 		       SMI_EN);
+ 		       (u64)SMI_EN);
 -		ret = -EIO;
 -		goto out_unmap;
 +		ret = -EBUSY;
 +		goto unmap_gcs;
  	}
  	if (turn_SMI_watchdog_clear_off >= iTCO_wdt_private.iTCO_version) {
 -		/* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
 +		/*
 +		 * Bit 13: TCO_EN -> 0
 +		 * Disables TCO logic generating an SMI#
 +		 */
  		val32 = inl(SMI_EN);
  		val32 &= 0xffffdfff;	/* Turn off SMI clearing watchdog */
  		outl(val32, SMI_EN);
  	}
  
 -	/* The TCO I/O registers reside in a 32-byte range pointed to
 -	   by the TCOBASE value */
 -	if (!request_region(TCOBASE, 0x20, "iTCO_wdt")) {
 -		pr_err("I/O address 0x%04lx already in use, device disabled\n",
 +	if (!request_region(iTCO_wdt_private.tco_res->start,
 +			resource_size(iTCO_wdt_private.tco_res), dev->name)) {
 +		pr_err("I/O address 0x%04llx already in use, device disabled\n",
- 		       TCOBASE);
+ 		       (u64)TCOBASE);
 -		ret = -EIO;
 -		goto unreg_smi_en;
 +		ret = -EBUSY;
 +		goto unreg_smi;
  	}
  
 -	pr_info("Found a %s TCO device (Version=%d, TCOBASE=0x%04lx)\n",
 -		iTCO_chipset_info[ent->driver_data].name,
 -		iTCO_chipset_info[ent->driver_data].iTCO_version,
 -		(u64)TCOBASE);
 +	pr_info("Found a %s TCO device (Version=%d, TCOBASE=0x%04llx)\n",
- 		ich_info->name, ich_info->iTCO_version, TCOBASE);
++		ich_info->name, ich_info->iTCO_version, (u64)TCOBASE);
  
  	/* Clear out the (probably old) status */
  	outw(0x0008, TCO1_STS);	/* Clear the Time Out Status bit */

Attachment: pgp00000.pgp
Description: PGP signature