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

Commit f51671fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use resource_size()
  [WATCHDOG] iTCO_wdt: add PCI ID for the Intel EP80579 (Tolapai) SoC
parents 2f99f5c8 b782a563

drivers/watchdog/adx_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -242,14 +242,14 @@ static int __devinit adx_wdt_probe(struct platform_device *pdev) 
	}



	res = devm_request_mem_region(&pdev->dev, res->start,

			res->end - res->start + 1, res->name);

			resource_size(res), res->name);

	if (!res) {

		dev_err(&pdev->dev, "cannot request I/O memory region\n");

		return -ENXIO;

	}



	wdt->base = devm_ioremap_nocache(&pdev->dev, res->start,

			res->end - res->start + 1);

			resource_size(res));

	if (!wdt->base) {

		dev_err(&pdev->dev, "cannot remap I/O memory region\n");

		return -ENXIO;

drivers/watchdog/at32ap700x_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	wdt->regs = ioremap(regs->start, regs->end - regs->start + 1);

	wdt->regs = ioremap(regs->start, resource_size(regs));

	if (!wdt->regs) {

		ret = -ENOMEM;

		dev_dbg(&pdev->dev, "could not map I/O memory\n");

drivers/watchdog/davinci_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev) 
		return -ENOENT;

	}



	size = res->end - res->start + 1;

	size = resource_size(res);

	wdt_mem = request_mem_region(res->start, size, pdev->name);



	if (wdt_mem == NULL) {

drivers/watchdog/iTCO_wdt.c

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 *	document number 316972-004, 316973-012: 82801I (ICH9)

 *	document number 319973-002, 319974-002: 82801J (ICH10)

 *	document number 322169-001, 322170-001: 5 Series, 3400 Series (PCH)

 *	document number 320066-003, 320257-008: EP80597 (IICH)

 */



/*
@@ -100,6 +101,7 @@ enum iTCO_chipsets { 
	TCO_PCH,	/* PCH Desktop Full Featured */

	TCO_PCHM,	/* PCH Mobile Full Featured */

	TCO_PCHMSFF,	/* PCH Mobile SFF Full Featured */

	TCO_EP80579,	/* EP80579 */

};



static struct {
@@ -143,6 +145,7 @@ static struct { 
	{"PCH Desktop Full Featured", 2},

	{"PCH Mobile Full Featured", 2},

	{"PCH Mobile SFF Full Featured", 2},

	{"EP80579", 2},

	{NULL, 0}

};
@@ -214,6 +217,7 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = { 
	{ ITCO_PCI_DEVICE(0x3b00,				TCO_PCH)},

	{ ITCO_PCI_DEVICE(0x3b01,				TCO_PCHM)},

	{ ITCO_PCI_DEVICE(0x3b0d,				TCO_PCHMSFF)},

	{ ITCO_PCI_DEVICE(0x5031,				TCO_EP80579)},

	{ 0, },			/* End of list */

};

MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);

drivers/watchdog/mpcore_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev) 
		ret = -ENXIO;

		goto err_free;

	}

	wdt->base = ioremap(res->start, res->end - res->start + 1);

	wdt->base = ioremap(res->start, resource_size(res));

	if (!wdt->base) {

		ret = -ENOMEM;

		goto err_free;