From cf36fe0f5d0b3bdd12f83ad884d44af9169b3c7a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 24 Nov 2010 19:39:07 +0000 Subject: [PATCH] --- yaml --- r: 228207 b: refs/heads/master c: 6f89be93ce6e718a51215336845c70ada06627ba h: refs/heads/master i: 228205: 71c411cbaa72c62db50783f76c29d6fedfc0b774 228203: 53d76661dfa200030809cdde2174aac38bfe6be8 228199: 2e07e303fa0794310e7892d502006eedbc0a04b8 228191: 6aacaa5695eab2496e2dd5a867807e538dd4dffa v: v3 --- [refs] | 2 +- trunk/drivers/staging/sep/sep_driver.c | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 2fcd6a8fdcde..115cf5d50699 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bb3af58d0f712c728cf1230539044d94c9a3be0 +refs/heads/master: 6f89be93ce6e718a51215336845c70ada06627ba diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index ebe7a90aec0e..5e27b5a4d043 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -1037,8 +1037,6 @@ static int sep_allocate_data_pool_memory_handler(struct sep_device *sep, sizeof(struct alloc_struct)); if (error) { error = -EFAULT; - dev_warn(&sep->pdev->dev, - "allocate data pool copy to user error\n"); goto end_function; } @@ -1083,13 +1081,10 @@ static int sep_lock_kernel_pages(struct sep_device *sep, /* Map array */ struct sep_dma_map *map_array; - dev_dbg(&sep->pdev->dev, - "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, - "data_size is %x\n", data_size); + dev_dbg(&sep->pdev->dev, "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, "data_size is %x\n", data_size); lli_array = kmalloc(sizeof(struct sep_lli_entry), GFP_ATOMIC); if (!lli_array) { @@ -1182,8 +1177,7 @@ static int sep_lock_user_pages(struct sep_device *sep, /* Direction of the DMA mapping for locked pages */ enum dma_data_direction dir; - dev_dbg(&sep->pdev->dev, - "sep_lock_user_pages start\n"); + dev_dbg(&sep->pdev->dev, "sep_lock_user_pages start\n"); /* Set start and end pages and num pages */ end_page = (app_virt_addr + data_size - 1) >> PAGE_SHIFT;