android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genwqe: Remove unused variable and rename function

Browse Source 
This is a clean-up patch, no functional changes intended.

It removes an unused variable from do_execute_ddcb() and
also renames the function free_user_pages(), prepending
"genwqe" prefix in order to clarify the code.

Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Guilherme G. Piccoli
2017-12-14 12:34:04 -02:00
committed by Greg Kroah-Hartman
parent 9a479b0853
commit 07864a1779
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/misc/genwqe/card_dev.c
View File

@ -1011,7 +1011,6 @@ static int do_execute_ddcb(struct genwqe_file *cfile,
{ {
int rc; int rc;
struct genwqe_ddcb_cmd *cmd; struct genwqe_ddcb_cmd *cmd;
struct ddcb_requ *req;
struct genwqe_dev *cd = cfile->cd; struct genwqe_dev *cd = cfile->cd;
struct file *filp = cfile->filp; struct file *filp = cfile->filp;
@ -1019,8 +1018,6 @@ static int do_execute_ddcb(struct genwqe_file *cfile,
if (cmd == NULL) if (cmd == NULL)
return -ENOMEM; return -ENOMEM;
req = container_of(cmd, struct ddcb_requ, cmd);
if (copy_from_user(cmd, (void __user *)arg, sizeof(*cmd))) { if (copy_from_user(cmd, (void __user *)arg, sizeof(*cmd))) {
ddcb_requ_free(cmd); ddcb_requ_free(cmd);
return -EFAULT; return -EFAULT;

20
drivers/misc/genwqe/card_utils.c
View File

@ -524,22 +524,16 @@ int genwqe_free_sync_sgl(struct genwqe_dev *cd, struct genwqe_sgl *sgl)
} }
/** /**
* free_user_pages() - Give pinned pages back * genwqe_free_user_pages() - Give pinned pages back
* *
* Documentation of get_user_pages is in mm/memory.c: * Documentation of get_user_pages is in mm/gup.c:
* *
* If the page is written to, set_page_dirty (or set_page_dirty_lock, * If the page is written to, set_page_dirty (or set_page_dirty_lock,
* as appropriate) must be called after the page is finished with, and * as appropriate) must be called after the page is finished with, and
* before put_page is called. * before put_page is called.
*
* FIXME Could be of use to others and might belong in the generic
* code, if others agree. E.g.
* ll_free_user_pages in drivers/staging/lustre/lustre/llite/rw26.c
* ceph_put_page_vector in net/ceph/pagevec.c
* maybe more?
*/ */
static int free_user_pages(struct page **page_list, unsigned int nr_pages, static int genwqe_free_user_pages(struct page **page_list,
int dirty) unsigned int nr_pages, int dirty)
{ {
unsigned int i; unsigned int i;
@ -617,7 +611,7 @@ int genwqe_user_vmap(struct genwqe_dev *cd, struct dma_mapping *m, void *uaddr,
/* assumption: get_user_pages can be killed by signals. */ /* assumption: get_user_pages can be killed by signals. */
if (rc < m->nr_pages) { if (rc < m->nr_pages) {
free_user_pages(m->page_list, rc, m->write); genwqe_free_user_pages(m->page_list, rc, m->write);
rc = -EFAULT; rc = -EFAULT;
goto fail_get_user_pages; goto fail_get_user_pages;
} }
@ -629,7 +623,7 @@ int genwqe_user_vmap(struct genwqe_dev *cd, struct dma_mapping *m, void *uaddr,
return 0; return 0;
fail_free_user_pages: fail_free_user_pages:
free_user_pages(m->page_list, m->nr_pages, m->write); genwqe_free_user_pages(m->page_list, m->nr_pages, m->write);
fail_get_user_pages: fail_get_user_pages:
kfree(m->page_list); kfree(m->page_list);
@ -662,7 +656,7 @@ int genwqe_user_vunmap(struct genwqe_dev *cd, struct dma_mapping *m,
genwqe_unmap_pages(cd, m->dma_list, m->nr_pages); genwqe_unmap_pages(cd, m->dma_list, m->nr_pages);
if (m->page_list) { if (m->page_list) {
free_user_pages(m->page_list, m->nr_pages, m->write); genwqe_free_user_pages(m->page_list, m->nr_pages, m->write);
kfree(m->page_list); kfree(m->page_list);
m->page_list = NULL; m->page_list = NULL;