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

Commit d6ae0c63 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: softdog.c: enhancement to optionally invoke panic instead of reboot on timer expiry
  watchdog: fix nv_tco section mismatch
  watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase.
  watchdog: Convert release_resource to release_region/release_mem_region
  watchdog: s3c2410_wdt.c: Convert release_resource to release_region/release_mem_region
parents 8c82840e 7fff4beb

drivers/watchdog/davinci_wdt.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -202,7 +202,6 @@ static struct miscdevice davinci_wdt_miscdev = { 
static int __devinit davinci_wdt_probe(struct platform_device *pdev)

static int __devinit davinci_wdt_probe(struct platform_device *pdev)

{

{

	int ret = 0, size;

	int ret = 0, size;

	struct resource *res;

	struct device *dev = &pdev->dev;

	struct device *dev = &pdev->dev;





	wdt_clk = clk_get(dev, NULL);

	wdt_clk = clk_get(dev, NULL);
@@ -216,31 +215,31 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev) 




	dev_info(dev, "heartbeat %d sec\n", heartbeat);

	dev_info(dev, "heartbeat %d sec\n", heartbeat);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

	if (wdt_mem == NULL) {

		dev_err(dev, "failed to get memory region resource\n");

		dev_err(dev, "failed to get memory region resource\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	size = resource_size(res);

	size = resource_size(wdt_mem);

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

	if (!request_mem_region(wdt_mem->start, size, pdev->name)) {



	if (wdt_mem == NULL) {

		dev_err(dev, "failed to get memory region\n");

		dev_err(dev, "failed to get memory region\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	wdt_base = ioremap(res->start, size);

	wdt_base = ioremap(wdt_mem->start, size);

	if (!wdt_base) {

	if (!wdt_base) {

		dev_err(dev, "failed to map memory region\n");

		dev_err(dev, "failed to map memory region\n");

		release_mem_region(wdt_mem->start, size);

		wdt_mem = NULL;

		return -ENOMEM;

		return -ENOMEM;

	}

	}





	ret = misc_register(&davinci_wdt_miscdev);

	ret = misc_register(&davinci_wdt_miscdev);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(dev, "cannot register misc device\n");

		dev_err(dev, "cannot register misc device\n");

		release_resource(wdt_mem);

		release_mem_region(wdt_mem->start, size);

		kfree(wdt_mem);

		wdt_mem = NULL;

	} else {

	} else {

		set_bit(WDT_DEVICE_INITED, &wdt_status);

		set_bit(WDT_DEVICE_INITED, &wdt_status);

	}

	}
@@ -253,8 +252,7 @@ static int __devexit davinci_wdt_remove(struct platform_device *pdev) 
{

{

	misc_deregister(&davinci_wdt_miscdev);

	misc_deregister(&davinci_wdt_miscdev);

	if (wdt_mem) {

	if (wdt_mem) {

		release_resource(wdt_mem);

		release_mem_region(wdt_mem->start, resource_size(wdt_mem));

		kfree(wdt_mem);

		wdt_mem = NULL;

		wdt_mem = NULL;

	}

	}

drivers/watchdog/max63xx_wdt.c

+8 −12
Original line number Original line Diff line number Diff line
@@ -270,7 +270,6 @@ static int __devinit max63xx_wdt_probe(struct platform_device *pdev) 
{

{

	int ret = 0;

	int ret = 0;

	int size;

	int size;

	struct resource *res;

	struct device *dev = &pdev->dev;

	struct device *dev = &pdev->dev;

	struct max63xx_timeout *table;

	struct max63xx_timeout *table;
@@ -294,21 +293,19 @@ static int __devinit max63xx_wdt_probe(struct platform_device *pdev) 




	max63xx_pdev = pdev;

	max63xx_pdev = pdev;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

	if (wdt_mem == NULL) {

		dev_err(dev, "failed to get memory region resource\n");

		dev_err(dev, "failed to get memory region resource\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	size = resource_size(res);

	size = resource_size(wdt_mem);

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

	if (!request_mem_region(wdt_mem->start, size, pdev->name)) {



	if (wdt_mem == NULL) {

		dev_err(dev, "failed to get memory region\n");

		dev_err(dev, "failed to get memory region\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	wdt_base = ioremap(res->start, size);

	wdt_base = ioremap(wdt_mem->start, size);

	if (!wdt_base) {

	if (!wdt_base) {

		dev_err(dev, "failed to map memory region\n");

		dev_err(dev, "failed to map memory region\n");

		ret = -ENOMEM;

		ret = -ENOMEM;
@@ -326,8 +323,8 @@ static int __devinit max63xx_wdt_probe(struct platform_device *pdev) 
out_unmap:

out_unmap:

	iounmap(wdt_base);

	iounmap(wdt_base);

out_request:

out_request:

	release_resource(wdt_mem);

	release_mem_region(wdt_mem->start, size);

	kfree(wdt_mem);

	wdt_mem = NULL;





	return ret;

	return ret;

}

}
@@ -336,8 +333,7 @@ static int __devexit max63xx_wdt_remove(struct platform_device *pdev) 
{

{

	misc_deregister(&max63xx_wdt_miscdev);

	misc_deregister(&max63xx_wdt_miscdev);

	if (wdt_mem) {

	if (wdt_mem) {

		release_resource(wdt_mem);

		release_mem_region(wdt_mem->start, resource_size(wdt_mem));

		kfree(wdt_mem);

		wdt_mem = NULL;

		wdt_mem = NULL;

	}

	}

drivers/watchdog/nv_tco.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -302,7 +302,7 @@ MODULE_DEVICE_TABLE(pci, tco_pci_tbl); 
 *	Init & exit routines

 *	Init & exit routines

 */

 */





static unsigned char __init nv_tco_getdevice(void)

static unsigned char __devinit nv_tco_getdevice(void)

{

{

	struct pci_dev *dev = NULL;

	struct pci_dev *dev = NULL;

	u32 val;

	u32 val;

drivers/watchdog/pnx4008_wdt.c

+13 −15
Original line number Original line Diff line number Diff line
@@ -254,7 +254,6 @@ static struct miscdevice pnx4008_wdt_miscdev = { 
static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)

static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)

{

{

	int ret = 0, size;

	int ret = 0, size;

	struct resource *res;





	if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)

	if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)

		heartbeat = DEFAULT_HEARTBEAT;

		heartbeat = DEFAULT_HEARTBEAT;
@@ -262,42 +261,42 @@ static int __devinit pnx4008_wdt_probe(struct platform_device *pdev) 
	printk(KERN_INFO MODULE_NAME

	printk(KERN_INFO MODULE_NAME

		"PNX4008 Watchdog Timer: heartbeat %d sec\n", heartbeat);

		"PNX4008 Watchdog Timer: heartbeat %d sec\n", heartbeat);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

	if (wdt_mem == NULL) {

		printk(KERN_INFO MODULE_NAME

		printk(KERN_INFO MODULE_NAME

			"failed to get memory region resouce\n");

			"failed to get memory region resouce\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	size = resource_size(res);

	size = resource_size(wdt_mem);

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





	if (wdt_mem == NULL) {

	if (!request_mem_region(wdt_mem->start, size, pdev->name)) {

		printk(KERN_INFO MODULE_NAME "failed to get memory region\n");

		printk(KERN_INFO MODULE_NAME "failed to get memory region\n");

		return -ENOENT;

		return -ENOENT;

	}

	}

	wdt_base = (void __iomem *)IO_ADDRESS(res->start);

	wdt_base = (void __iomem *)IO_ADDRESS(wdt_mem->start);





	wdt_clk = clk_get(&pdev->dev, NULL);

	wdt_clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(wdt_clk)) {

	if (IS_ERR(wdt_clk)) {

		ret = PTR_ERR(wdt_clk);

		ret = PTR_ERR(wdt_clk);

		release_resource(wdt_mem);

		release_mem_region(wdt_mem->start, size);

		kfree(wdt_mem);

		wdt_mem = NULL;

		goto out;

		goto out;

	}

	}





	ret = clk_enable(wdt_clk);

	ret = clk_enable(wdt_clk);

	if (ret) {

	if (ret) {

		release_resource(wdt_mem);

		release_mem_region(wdt_mem->start, size);

		kfree(wdt_mem);

		wdt_mem = NULL;

		clk_put(wdt_clk);

		goto out;

		goto out;

	}

	}





	ret = misc_register(&pnx4008_wdt_miscdev);

	ret = misc_register(&pnx4008_wdt_miscdev);

	if (ret < 0) {

	if (ret < 0) {

		printk(KERN_ERR MODULE_NAME "cannot register misc device\n");

		printk(KERN_ERR MODULE_NAME "cannot register misc device\n");

		release_resource(wdt_mem);

		release_mem_region(wdt_mem->start, size);

		kfree(wdt_mem);

		wdt_mem = NULL;

		clk_disable(wdt_clk);

		clk_disable(wdt_clk);

		clk_put(wdt_clk);

		clk_put(wdt_clk);

	} else {

	} else {
@@ -320,8 +319,7 @@ static int __devexit pnx4008_wdt_remove(struct platform_device *pdev) 
	clk_put(wdt_clk);

	clk_put(wdt_clk);





	if (wdt_mem) {

	if (wdt_mem) {

		release_resource(wdt_mem);

		release_mem_region(wdt_mem->start, resource_size(wdt_mem));

		kfree(wdt_mem);

		wdt_mem = NULL;

		wdt_mem = NULL;

	}

	}

	return 0;

	return 0;

drivers/watchdog/s3c2410_wdt.c

+8 −11
Original line number Original line Diff line number Diff line
@@ -402,7 +402,6 @@ static inline void s3c2410wdt_cpufreq_deregister(void) 




static int __devinit s3c2410wdt_probe(struct platform_device *pdev)

static int __devinit s3c2410wdt_probe(struct platform_device *pdev)

{

{

	struct resource *res;

	struct device *dev;

	struct device *dev;

	unsigned int wtcon;

	unsigned int wtcon;

	int started = 0;

	int started = 0;
@@ -416,20 +415,19 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev) 




	/* get the memory region for the watchdog timer */

	/* get the memory region for the watchdog timer */





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (res == NULL) {

	if (wdt_mem == NULL) {

		dev_err(dev, "no memory resource specified\n");

		dev_err(dev, "no memory resource specified\n");

		return -ENOENT;

		return -ENOENT;

	}

	}





	size = resource_size(res);

	size = resource_size(wdt_mem);

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

	if (!request_mem_region(wdt_mem->start, size, pdev->name)) {

	if (wdt_mem == NULL) {

		dev_err(dev, "failed to get memory region\n");

		dev_err(dev, "failed to get memory region\n");

		return -EBUSY;

		return -EBUSY;

	}

	}





	wdt_base = ioremap(res->start, size);

	wdt_base = ioremap(wdt_mem->start, size);

	if (wdt_base == NULL) {

	if (wdt_base == NULL) {

		dev_err(dev, "failed to ioremap() region\n");

		dev_err(dev, "failed to ioremap() region\n");

		ret = -EINVAL;

		ret = -EINVAL;
@@ -524,8 +522,8 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev) 
	iounmap(wdt_base);

	iounmap(wdt_base);





 err_req:

 err_req:

	release_resource(wdt_mem);

	release_mem_region(wdt_mem->start, size);

	kfree(wdt_mem);

	wdt_mem = NULL;





	return ret;

	return ret;

}

}
@@ -545,8 +543,7 @@ static int __devexit s3c2410wdt_remove(struct platform_device *dev) 




	iounmap(wdt_base);

	iounmap(wdt_base);





	release_resource(wdt_mem);

	release_mem_region(wdt_mem->start, resource_size(wdt_mem));

	kfree(wdt_mem);

	wdt_mem = NULL;

	wdt_mem = NULL;

	return 0;

	return 0;

}

}