diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-20 13:45:13 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-21 13:10:10 -0400 |
commit | 7096d0422153ffcc2264eef652fc3a7bca3e6d3c (patch) | |
tree | 2be6139f1e26acb4d0680e50a87623bc18938147 /drivers/base/platform.c | |
parent | bda80da469a93122121de601dd469ce1aaa6effa (diff) |
of/device: Rework to use common platform_device_alloc() for allocating devices
The current code allocates and manages platform_devices created from
the device tree manually. It also uses an unsafe shortcut for
allocating the platform_device and the resource table at the same
time. (which I added in the last rework; sorry).
This patch refactors the code to use platform_device_alloc() for
allocating new devices. This reduces the amount of custom code
implemented by of_platform, eliminates the unsafe alloc trick, and has
the side benefit of letting the platform_bus code manage freeing the
device data and resources when the device is freed.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers/base/platform.c')
-rw-r--r-- | drivers/base/platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index c6c933f58102..2fff59cef505 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
@@ -147,6 +147,7 @@ static void platform_device_release(struct device *dev) | |||
147 | struct platform_object *pa = container_of(dev, struct platform_object, | 147 | struct platform_object *pa = container_of(dev, struct platform_object, |
148 | pdev.dev); | 148 | pdev.dev); |
149 | 149 | ||
150 | of_device_node_put(&pa->pdev.dev); | ||
150 | kfree(pa->pdev.dev.platform_data); | 151 | kfree(pa->pdev.dev.platform_data); |
151 | kfree(pa->pdev.resource); | 152 | kfree(pa->pdev.resource); |
152 | kfree(pa); | 153 | kfree(pa); |