Commit 6f89be93 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

Staging: sep: clean up a couple of spots missed in pass one

Another copy_user case and some formatting of dbg
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2bb3af58
...@@ -1037,8 +1037,6 @@ static int sep_allocate_data_pool_memory_handler(struct sep_device *sep, ...@@ -1037,8 +1037,6 @@ static int sep_allocate_data_pool_memory_handler(struct sep_device *sep,
sizeof(struct alloc_struct)); sizeof(struct alloc_struct));
if (error) { if (error) {
error = -EFAULT; error = -EFAULT;
dev_warn(&sep->pdev->dev,
"allocate data pool copy to user error\n");
goto end_function; goto end_function;
} }
...@@ -1083,13 +1081,10 @@ static int sep_lock_kernel_pages(struct sep_device *sep, ...@@ -1083,13 +1081,10 @@ static int sep_lock_kernel_pages(struct sep_device *sep,
/* Map array */ /* Map array */
struct sep_dma_map *map_array; struct sep_dma_map *map_array;
dev_dbg(&sep->pdev->dev, dev_dbg(&sep->pdev->dev, "sep_lock_kernel_pages start\n");
"sep_lock_kernel_pages start\n"); dev_dbg(&sep->pdev->dev, "kernel_virt_addr is %08x\n",
kernel_virt_addr);
dev_dbg(&sep->pdev->dev, dev_dbg(&sep->pdev->dev, "data_size is %x\n", data_size);
"kernel_virt_addr is %08x\n", kernel_virt_addr);
dev_dbg(&sep->pdev->dev,
"data_size is %x\n", data_size);
lli_array = kmalloc(sizeof(struct sep_lli_entry), GFP_ATOMIC); lli_array = kmalloc(sizeof(struct sep_lli_entry), GFP_ATOMIC);
if (!lli_array) { if (!lli_array) {
...@@ -1182,8 +1177,7 @@ static int sep_lock_user_pages(struct sep_device *sep, ...@@ -1182,8 +1177,7 @@ static int sep_lock_user_pages(struct sep_device *sep,
/* Direction of the DMA mapping for locked pages */ /* Direction of the DMA mapping for locked pages */
enum dma_data_direction dir; enum dma_data_direction dir;
dev_dbg(&sep->pdev->dev, dev_dbg(&sep->pdev->dev, "sep_lock_user_pages start\n");
"sep_lock_user_pages start\n");
/* Set start and end pages and num pages */ /* Set start and end pages and num pages */
end_page = (app_virt_addr + data_size - 1) >> PAGE_SHIFT; end_page = (app_virt_addr + data_size - 1) >> PAGE_SHIFT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment