Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 658a494a authored by Guilherme G. Piccoli's avatar Guilherme G. Piccoli Committed by Greg Kroah-Hartman
Browse files

genwqe: Remove unused parameter in some functions 



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

It removes the unused parameter of type "struct ddcb_requ*" from
the functions genwqe_user_vmap() and genwqe_user_vunmap().

Signed-off-by: default avatarGuilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d14e766

drivers/misc/genwqe/card_base.h

+2 −4
Original line number Diff line number Diff line
@@ -490,11 +490,9 @@ int genwqe_read_app_id(struct genwqe_dev *cd, char *app_name, int len); 


/* Memory allocation/deallocation; dma address handling */

int  genwqe_user_vmap(struct genwqe_dev *cd, struct dma_mapping *m,

		      void *uaddr, unsigned long size,

		      struct ddcb_requ *req);

		      void *uaddr, unsigned long size);



int  genwqe_user_vunmap(struct genwqe_dev *cd, struct dma_mapping *m,

			struct ddcb_requ *req);

int  genwqe_user_vunmap(struct genwqe_dev *cd, struct dma_mapping *m);



static inline bool dma_mapping_used(struct dma_mapping *m)

{

drivers/misc/genwqe/card_dev.c

+6 −6
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void genwqe_remove_mappings(struct genwqe_file *cfile) 
			kfree(dma_map);

		} else if (dma_map->type == GENWQE_MAPPING_SGL_TEMP) {

			/* we use dma_map statically from the request */

			genwqe_user_vunmap(cd, dma_map, NULL);

			genwqe_user_vunmap(cd, dma_map);

		}

	}

}
@@ -249,7 +249,7 @@ static void genwqe_remove_pinnings(struct genwqe_file *cfile) 
		 * deleted.

		 */

		list_del_init(&dma_map->pin_list);

		genwqe_user_vunmap(cd, dma_map, NULL);

		genwqe_user_vunmap(cd, dma_map);

		kfree(dma_map);

	}

}
@@ -790,7 +790,7 @@ static int genwqe_pin_mem(struct genwqe_file *cfile, struct genwqe_mem *m) 
		return -ENOMEM;



	genwqe_mapping_init(dma_map, GENWQE_MAPPING_SGL_PINNED);

	rc = genwqe_user_vmap(cd, dma_map, (void *)map_addr, map_size, NULL);

	rc = genwqe_user_vmap(cd, dma_map, (void *)map_addr, map_size);

	if (rc != 0) {

		dev_err(&pci_dev->dev,

			"[%s] genwqe_user_vmap rc=%d\n", __func__, rc);
@@ -820,7 +820,7 @@ static int genwqe_unpin_mem(struct genwqe_file *cfile, struct genwqe_mem *m) 
		return -ENOENT;



	genwqe_del_pin(cfile, dma_map);

	genwqe_user_vunmap(cd, dma_map, NULL);

	genwqe_user_vunmap(cd, dma_map);

	kfree(dma_map);

	return 0;

}
@@ -841,7 +841,7 @@ static int ddcb_cmd_cleanup(struct genwqe_file *cfile, struct ddcb_requ *req) 


		if (dma_mapping_used(dma_map)) {

			__genwqe_del_mapping(cfile, dma_map);

			genwqe_user_vunmap(cd, dma_map, req);

			genwqe_user_vunmap(cd, dma_map);

		}

		if (req->sgls[i].sgl != NULL)

			genwqe_free_sync_sgl(cd, &req->sgls[i]);
@@ -947,7 +947,7 @@ static int ddcb_cmd_fixups(struct genwqe_file *cfile, struct ddcb_requ *req) 
					m->write = 0;



				rc = genwqe_user_vmap(cd, m, (void *)u_addr,

						      u_size, req);

						      u_size);

				if (rc != 0)

					goto err_out;

drivers/misc/genwqe/card_utils.c

+2 −3
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static int genwqe_free_user_pages(struct page **page_list, 
 * Return: 0 if success

 */

int genwqe_user_vmap(struct genwqe_dev *cd, struct dma_mapping *m, void *uaddr,

		     unsigned long size, struct ddcb_requ *req)

		     unsigned long size)

{

	int rc = -EINVAL;

	unsigned long data, offs;
@@ -641,8 +641,7 @@ int genwqe_user_vmap(struct genwqe_dev *cd, struct dma_mapping *m, void *uaddr, 
 * @cd:         pointer to genwqe device

 * @m:          mapping params

 */

int genwqe_user_vunmap(struct genwqe_dev *cd, struct dma_mapping *m,

		       struct ddcb_requ *req)

int genwqe_user_vunmap(struct genwqe_dev *cd, struct dma_mapping *m)

{

	struct pci_dev *pci_dev = cd->pci_dev;