|
@@ -4,6 +4,7 @@
|
|
|
* Copyright (c) 2000 Eric Brower (ebrower@usa.net)
|
|
|
*/
|
|
|
|
|
|
+#include <linux/device.h>
|
|
|
#include <linux/kernel.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/fs.h>
|
|
@@ -180,7 +181,7 @@ static int d7s_probe(struct platform_device *op)
|
|
|
if (d7s_device)
|
|
|
goto out;
|
|
|
|
|
|
- p = kzalloc(sizeof(*p), GFP_KERNEL);
|
|
|
+ p = devm_kzalloc(&op->dev, sizeof(*p), GFP_KERNEL);
|
|
|
err = -ENOMEM;
|
|
|
if (!p)
|
|
|
goto out;
|
|
@@ -231,7 +232,6 @@ out_iounmap:
|
|
|
of_iounmap(&op->resource[0], p->regs, sizeof(u8));
|
|
|
|
|
|
out_free:
|
|
|
- kfree(p);
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
@@ -251,7 +251,6 @@ static int d7s_remove(struct platform_device *op)
|
|
|
|
|
|
misc_deregister(&d7s_miscdev);
|
|
|
of_iounmap(&op->resource[0], p->regs, sizeof(u8));
|
|
|
- kfree(p);
|
|
|
|
|
|
return 0;
|
|
|
}
|