The patch titled
Subject: drivers-dma-contiguous-add-initialization-from-device-tree-fix
has been removed from the -mm tree. Its filename was
drivers-dma-contiguous-add-initialization-from-device-tree-fix.patch
This patch was dropped because it was folded into drivers-dma-contiguous-add-initialization-from-device-tree.patch
------------------------------------------------------
From: Michal Nazarewicz <mina86@xxxxxxxxxx>
Subject: drivers-dma-contiguous-add-initialization-from-device-tree-fix
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/dma-contiguous.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -puN drivers/base/dma-contiguous.c~drivers-dma-contiguous-add-initialization-from-device-tree-fix drivers/base/dma-contiguous.c
--- a/drivers/base/dma-contiguous.c~drivers-dma-contiguous-add-initialization-from-device-tree-fix
+++ a/drivers/base/dma-contiguous.c
@@ -223,13 +223,9 @@ bool dma_release_from_contiguous(struct
#undef pr_fmt
#define pr_fmt(fmt) fmt
-static int rmem_cma_device_init(struct reserved_mem *rmem, struct device *dev)
+static void rmem_cma_device_init(struct reserved_mem *rmem, struct device *dev)
{
- struct cma *cma = rmem->priv;
- if (!cma)
- return -ENODEV;
-
- dev_set_cma_area(dev, cma);
+ dev_set_cma_area(dev, rmem->priv);
return 0;
}
_
Patches currently in -mm which might be from mina86@xxxxxxxxxx are
origin.patch
mm-cma-fix-cma-bitmap-aligned-mask-computing.patch
mm-cma-fix-cma-bitmap-aligned-mask-computing-checkpatch-fixes.patch
drivers-dma-coherent-add-initialization-from-device-tree.patch
drivers-dma-contiguous-add-initialization-from-device-tree.patch
drivers-dma-contiguous-add-initialization-from-device-tree-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
