nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

watchdog: omap_wdt: convert to devm_ functions

Browse source 
Use devm_kzalloc(), devm_request_mem_region() ande devm_ioremap()
to simplify the code.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Aaro Koskinen 2012-10-10 23:23:33 +03:00 committed by Wim Van Sebroeck
parent 67c0f55468
commit 4f4753d96d
1 changed files with 13 additions and 37 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/watchdog/omap_wdt.c
View file

@ -208,28 +208,23 @@ static int omap_wdt_probe(struct platform_device *pdev)
u32 rs; u32 rs;
int ret; int ret;
omap_wdt = kzalloc(sizeof(*omap_wdt), GFP_KERNEL); omap_wdt = devm_kzalloc(&pdev->dev, sizeof(*omap_wdt), GFP_KERNEL);
if (!omap_wdt) if (!omap_wdt)
return -ENOMEM; return -ENOMEM;
/* reserve static register mappings */ /* reserve static register mappings */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { if (!res)
ret = -ENOENT; return -ENOENT;
goto err_get_resource;
}
mem = request_mem_region(res->start, resource_size(res), pdev->name); mem = devm_request_mem_region(&pdev->dev, res->start,
if (!mem) { resource_size(res), pdev->name);
ret = -EBUSY; if (!mem)
goto err_busy; return -EBUSY;
}
wdev = kzalloc(sizeof(struct omap_wdt_dev), GFP_KERNEL); wdev = devm_kzalloc(&pdev->dev, sizeof(*wdev), GFP_KERNEL);
if (!wdev) { if (!wdev)
ret = -ENOMEM; return -ENOMEM;
goto err_kzalloc;
}
wdev->omap_wdt_users = false; wdev->omap_wdt_users = false;
wdev->mem = mem; wdev->mem = mem;
@ -237,11 +232,9 @@ static int omap_wdt_probe(struct platform_device *pdev)
wdev->wdt_trgr_pattern = 0x1234; wdev->wdt_trgr_pattern = 0x1234;
mutex_init(&wdev->lock); mutex_init(&wdev->lock);
wdev->base = ioremap(res->start, resource_size(res)); wdev->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
if (!wdev->base) { if (!wdev->base)
ret = -ENOMEM; return -ENOMEM;
goto err_ioremap;
}
omap_wdt->info = &omap_wdt_info; omap_wdt->info = &omap_wdt_info;
omap_wdt->ops = &omap_wdt_ops; omap_wdt->ops = &omap_wdt_ops;
@ -286,18 +279,7 @@ static int omap_wdt_probe(struct platform_device *pdev)
err_register: err_register:
pm_runtime_disable(wdev->dev); pm_runtime_disable(wdev->dev);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
iounmap(wdev->base);
err_ioremap:
wdev->base = NULL;
kfree(wdev);
err_kzalloc:
release_mem_region(res->start, resource_size(res));
err_busy:
err_get_resource:
kfree(omap_wdt);
return ret; return ret;
} }
@ -322,14 +304,8 @@ static int omap_wdt_remove(struct platform_device *pdev)
pm_runtime_disable(wdev->dev); pm_runtime_disable(wdev->dev);
watchdog_unregister_device(wdog); watchdog_unregister_device(wdog);
release_mem_region(res->start, resource_size(res));
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
iounmap(wdev->base);
kfree(wdev);
kfree(wdog);
return 0; return 0;
} }