Commit ccbaef5d authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

misc: genwqe: remove several redundant variables 



The variables val16, type, pci_dev and type are set but are never used
hence they are redundant and can be removed.

Cleans up clang warnings:
warning: variable 'type' set but not used [-Wunused-but-set-variable]
warning: variable 'val16' set but not used [-Wunused-but-set-variable]
warning: variable 'pci_dev' set but not used [-Wunused-but-set-variable]
warning: variable 'type' set but not used [-Wunused-but-set-variable]

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9cf04a29

drivers/misc/genwqe/card_debugfs.c

+0 −4
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ GENWQE_DEBUGFS_RO(ddcb_info, genwqe_ddcb_info_show); 
static int genwqe_info_show(struct seq_file *s, void *unused)

{

	struct genwqe_dev *cd = s->private;

	u16 val16, type;

	u64 app_id, slu_id, bitstream = -1;

	struct pci_dev *pci_dev = cd->pci_dev;
@@ -315,9 +314,6 @@ static int genwqe_info_show(struct seq_file *s, void *unused) 
	if (genwqe_is_privileged(cd))

		bitstream = __genwqe_readq(cd, IO_SLU_BITSTREAM);



	val16 = (u16)(slu_id & 0x0fLLU);

	type  = (u16)((slu_id >> 20) & 0xffLLU);



	seq_printf(s, "%s driver version: %s\n"

		   "    Device Name/Type: %s %s CardIdx: %d\n"

		   "    SLU/APP Config  : 0x%016llx/0x%016llx\n"

drivers/misc/genwqe/card_dev.c

+0 −5
Original line number Diff line number Diff line
@@ -304,14 +304,12 @@ static int genwqe_open(struct inode *inode, struct file *filp) 
{

	struct genwqe_dev *cd;

	struct genwqe_file *cfile;

	struct pci_dev *pci_dev;



	cfile = kzalloc(sizeof(*cfile), GFP_KERNEL);

	if (cfile == NULL)

		return -ENOMEM;



	cd = container_of(inode->i_cdev, struct genwqe_dev, cdev_genwqe);

	pci_dev = cd->pci_dev;

	cfile->cd = cd;

	cfile->filp = filp;

	cfile->client = NULL;
@@ -864,7 +862,6 @@ static int ddcb_cmd_fixups(struct genwqe_file *cfile, struct ddcb_requ *req) 
	struct genwqe_dev *cd = cfile->cd;

	struct genwqe_ddcb_cmd *cmd = &req->cmd;

	struct dma_mapping *m;

	const char *type = "UNKNOWN";



	for (i = 0, asiv_offs = 0x00; asiv_offs <= 0x58;

	     i++, asiv_offs += 0x08) {
@@ -933,11 +930,9 @@ static int ddcb_cmd_fixups(struct genwqe_file *cfile, struct ddcb_requ *req) 


			m = genwqe_search_pin(cfile, u_addr, u_size, NULL);

			if (m != NULL) {

				type = "PINNING";

				page_offs = (u_addr -

					     (u64)m->u_vaddr)/PAGE_SIZE;

			} else {

				type = "MAPPING";

				m = &req->dma_mappings[i];



				genwqe_mapping_init(m,

CRA Git | Maintained and supported by SUSTech CRA and CCSE