hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

watchdog: riowd: use devm_kzalloc() 

Use devm_kzalloc() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Jingoo Han 2013-04-30 14:01:59 +09:00 committed by Wim Van Sebroeck
parent 52ccc5aca4
commit a508e2e634
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/watchdog/riowd.c
View File

@ -183,7 +183,7 @@ static int riowd_probe(struct platform_device *op)
goto out; goto out;
err = -ENOMEM; err = -ENOMEM;
p = kzalloc(sizeof(*p), GFP_KERNEL); p = devm_kzalloc(&op->dev, sizeof(*p), GFP_KERNEL);
if (!p) if (!p)
goto out; goto out;
@ -192,7 +192,7 @@ static int riowd_probe(struct platform_device *op)
p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME); p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME);
if (!p->regs) { if (!p->regs) {
pr_err("Cannot map registers\n"); pr_err("Cannot map registers\n");
goto out_free; goto out;
} }
/* Make miscdev useable right away */ /* Make miscdev useable right away */
riowd_device = p; riowd_device = p;
@ -213,9 +213,6 @@ out_iounmap:
riowd_device = NULL; riowd_device = NULL;
of_iounmap(&op->resource[0], p->regs, 2); of_iounmap(&op->resource[0], p->regs, 2);
out_free:
kfree(p);
out: out:
return err; return err;
} }
@ -226,7 +223,6 @@ static int riowd_remove(struct platform_device *op)
misc_deregister(&riowd_miscdev); misc_deregister(&riowd_miscdev);
of_iounmap(&op->resource[0], p->regs, 2); of_iounmap(&op->resource[0], p->regs, 2);
kfree(p);
return 0; return 0;
} }