diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-10-11 09:27:28 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-10-15 10:26:07 +0200 |
| commit | 1931ee143b0ab72924944bc06e363d837ba05063 (patch) | |
| tree | 7d0f423772dfee812a3309c45474af9fea1be22b /drivers/of/platform.c | |
| parent | Revert "ARM: init: add support for reserved memory defined by device tree" (diff) | |
| download | linux-1931ee143b0ab72924944bc06e363d837ba05063.tar.xz linux-1931ee143b0ab72924944bc06e363d837ba05063.zip | |
Revert "drivers: of: add initialization code for dma reserved memory"
This reverts commit 9d8eab7af79cb4ce2de5de39f82c455b1f796963. There is
still no consensus on the bindings for the reserved memory and various
drawbacks of the proposed solution has been shown, so the best now is to
revert it completely and start again from scratch later.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of/platform.c')
| -rw-r--r-- | drivers/of/platform.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 9b439ac63d8e..f6dcde220821 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -21,7 +21,6 @@ #include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_platform.h> -#include <linux/of_reserved_mem.h> #include <linux/platform_device.h> const struct of_device_id of_default_bus_match_table[] = { @@ -219,8 +218,6 @@ static struct platform_device *of_platform_device_create_pdata( dev->dev.bus = &platform_bus_type; dev->dev.platform_data = platform_data; - of_reserved_mem_device_init(&dev->dev); - /* We do not fill the DMA ops for platform devices by default. * This is currently the responsibility of the platform code * to do such, possibly using a device notifier @@ -228,7 +225,6 @@ static struct platform_device *of_platform_device_create_pdata( if (of_device_add(dev) != 0) { platform_device_put(dev); - of_reserved_mem_device_release(&dev->dev); return NULL; } |