[PATCH] fixup

[Oleksandr Tyshchenko]

Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@xxxxxxxx>
---
 drivers/xen/Kconfig         |  2 ++
 drivers/xen/grant-dma-ops.c | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index b95581f..1727337 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -350,4 +350,6 @@ config XEN_VIRTIO
 	  guest type this will require special support on the backend side
 	  (qemu or kernel, depending on the virtio device types used).
 
+	  If in doubt, say n.
+
 endmenu
diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c
index 70d5d77..b9d93d7 100644
--- a/drivers/xen/grant-dma-ops.c
+++ b/drivers/xen/grant-dma-ops.c
@@ -139,7 +139,7 @@ static struct page *xen_grant_dma_alloc_pages(struct device *dev, size_t size,
 					      enum dma_data_direction dir,
 					      gfp_t gfp)
 {
-	WARN_ONCE(1, "xen_grant_dma_alloc_pages size %zu\n", size);
+	WARN_ONCE(1, "%s: size %zu\n", __func__, size);
 	return NULL;
 }
 
@@ -147,7 +147,7 @@ static void xen_grant_dma_free_pages(struct device *dev, size_t size,
 				     struct page *vaddr, dma_addr_t dma_handle,
 				     enum dma_data_direction dir)
 {
-	WARN_ONCE(1, "xen_grant_dma_free_pages size %zu\n", size);
+	WARN_ONCE(1, "%s: size %zu\n", __func__, size);
 }
 
 static dma_addr_t xen_grant_dma_map_page(struct device *dev, struct page *page,
@@ -160,7 +160,8 @@ static dma_addr_t xen_grant_dma_map_page(struct device *dev, struct page *page,
 	grant_ref_t grant;
 	dma_addr_t dma_handle;
 
-	BUG_ON(dir == DMA_NONE);
+	if (WARN_ON(dir == DMA_NONE))
+		return DMA_MAPPING_ERROR;
 
 	data = find_xen_grant_dma_data(dev);
 	if (!data)
@@ -190,7 +191,8 @@ static void xen_grant_dma_unmap_page(struct device *dev, dma_addr_t dma_handle,
 	unsigned int i, n_pages = PFN_UP(size);
 	grant_ref_t grant;
 
-	BUG_ON(dir == DMA_NONE);
+	if (WARN_ON(dir == DMA_NONE))
+		return;
 
 	data = find_xen_grant_dma_data(dev);
 	if (!data)
@@ -219,7 +221,8 @@ static void xen_grant_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
 	struct scatterlist *s;
 	unsigned int i;
 
-	BUG_ON(dir == DMA_NONE);
+	if (WARN_ON(dir == DMA_NONE))
+		return;
 
 	for_each_sg(sg, s, nents, i)
 		xen_grant_dma_unmap_page(dev, s->dma_address, sg_dma_len(s), dir,
@@ -233,7 +236,8 @@ static int xen_grant_dma_map_sg(struct device *dev, struct scatterlist *sg,
 	struct scatterlist *s;
 	unsigned int i;
 
-	BUG_ON(dir == DMA_NONE);
+	if (WARN_ON(dir == DMA_NONE))
+		return -EINVAL;
 
 	for_each_sg(sg, s, nents, i) {
 		s->dma_address = xen_grant_dma_map_page(dev, sg_page(s), s->offset,
@@ -303,10 +307,9 @@ void xen_grant_setup_dma_ops(struct device *dev)
 	}
 
 	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
-	if (!data) {
-		dev_err(dev, "Сannot allocate Xen grant DMA data\n");
+	if (!data)
 		goto err;
-	}
+
 	data->dev_domid = dev_domid;
 	data->dev = dev;
 
-- 
2.7.4


--------------1C2D46C789FB115F1F5DE02D--