Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jingoo Han and committed by
Wim Van Sebroeck
a508e2e6 52ccc5ac

+2 -6
+2 -6
drivers/watchdog/riowd.c
··· 183 183 goto out; 184 184 185 185 err = -ENOMEM; 186 - p = kzalloc(sizeof(*p), GFP_KERNEL); 186 + p = devm_kzalloc(&op->dev, sizeof(*p), GFP_KERNEL); 187 187 if (!p) 188 188 goto out; 189 189 ··· 192 192 p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME); 193 193 if (!p->regs) { 194 194 pr_err("Cannot map registers\n"); 195 - goto out_free; 195 + goto out; 196 196 } 197 197 /* Make miscdev useable right away */ 198 198 riowd_device = p; ··· 213 213 riowd_device = NULL; 214 214 of_iounmap(&op->resource[0], p->regs, 2); 215 215 216 - out_free: 217 - kfree(p); 218 - 219 216 out: 220 217 return err; 221 218 } ··· 223 226 224 227 misc_deregister(&riowd_miscdev); 225 228 of_iounmap(&op->resource[0], p->regs, 2); 226 - kfree(p); 227 229 228 230 return 0; 229 231 }