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

Commit 75f5a536 authored by Viresh Kumar's avatar Viresh Kumar Committed by Wim Van Sebroeck
Browse files

watchdog: mpcore_wdt: Use devm routines 



mpcore_wdt driver currently uses normal kzalloc, request_irq, ioremap, etc
routines. This patch replaces these routines with devm_kzalloc and
devm_request_mem_region etc, so that we don't need to handle freeing of
resources for error cases and module removal routine.

Also, request_irq is moved before registering misc device, so that we are ready
for irq as soon as device is registered.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent aa065770

drivers/watchdog/mpcore_wdt.c

+19 −39
Original line number Diff line number Diff line
@@ -338,43 +338,37 @@ static int __devinit mpcore_wdt_probe(struct platform_device *pdev) 
		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		ret = -ENODEV;

		goto err_out;

	}

	if (!res)

		return -ENODEV;



	wdt = kzalloc(sizeof(struct mpcore_wdt), GFP_KERNEL);

	if (!wdt) {

		ret = -ENOMEM;

		goto err_out;

	}

	wdt = devm_kzalloc(&pdev->dev, sizeof(struct mpcore_wdt), GFP_KERNEL);

	if (!wdt)

		return -ENOMEM;



	wdt->dev = &pdev->dev;

	wdt->irq = platform_get_irq(pdev, 0);

	if (wdt->irq < 0) {

		ret = -ENXIO;

		goto err_free;

	}

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

	if (!wdt->base) {

		ret = -ENOMEM;

		goto err_free;

	if (wdt->irq < 0)

		return -ENXIO;



	ret = devm_request_irq(wdt->dev, wdt->irq, mpcore_wdt_fire, 0,

			"mpcore_wdt", wdt);

	if (ret) {

		dev_printk(KERN_ERR, wdt->dev,

			"cannot register IRQ%d for watchdog\n", wdt->irq);

		return ret;

	}



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

	if (!wdt->base)

		return -ENOMEM;



	mpcore_wdt_miscdev.parent = &pdev->dev;

	ret = misc_register(&mpcore_wdt_miscdev);

	if (ret) {

		dev_printk(KERN_ERR, wdt->dev,

			"cannot register miscdev on minor=%d (err=%d)\n",

							WATCHDOG_MINOR, ret);

		goto err_misc;

	}



	ret = request_irq(wdt->irq, mpcore_wdt_fire, 0, "mpcore_wdt", wdt);

	if (ret) {

		dev_printk(KERN_ERR, wdt->dev,

			"cannot register IRQ%d for watchdog\n", wdt->irq);

		goto err_irq;

		return ret;

	}



	mpcore_wdt_stop(wdt);
@@ -382,30 +376,16 @@ static int __devinit mpcore_wdt_probe(struct platform_device *pdev) 
	mpcore_wdt_pdev = pdev;



	return 0;



err_irq:

	misc_deregister(&mpcore_wdt_miscdev);

err_misc:

	iounmap(wdt->base);

err_free:

	kfree(wdt);

err_out:

	return ret;

}



static int __devexit mpcore_wdt_remove(struct platform_device *pdev)

{

	struct mpcore_wdt *wdt = platform_get_drvdata(pdev);



	platform_set_drvdata(pdev, NULL);



	misc_deregister(&mpcore_wdt_miscdev);



	mpcore_wdt_pdev = NULL;



	free_irq(wdt->irq, wdt);

	iounmap(wdt->base);

	kfree(wdt);

	return 0;

}