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