From eec6f752f7241cc914cef0b832e1c99f81ba166a Mon Sep 17 00:00:00 2001 From: YueHaibing Date: Fri, 19 Oct 2018 13:03:06 +0000 Subject: [PATCH] octeontx2-af: Remove set but not used variables 'devnum, is_pf' Fixes gcc '-Wunused-but-set-variable' warning: drivers/net/ethernet/marvell/octeontx2/af/rvu.c: In function 'rvu_detach_rsrcs': drivers/net/ethernet/marvell/octeontx2/af/rvu.c:855:6: warning: variable 'devnum' set but not used [-Wunused-but-set-variable] drivers/net/ethernet/marvell/octeontx2/af/rvu.c:853:7: warning: variable 'is_pf' set but not used [-Wunused-but-set-variable] drivers/net/ethernet/marvell/octeontx2/af/rvu.c: In function 'rvu_mbox_handler_ATTACH_RESOURCES': drivers/net/ethernet/marvell/octeontx2/af/rvu.c:1054:7: warning: variable 'is_pf' set but not used [-Wunused-but-set-variable] drivers/net/ethernet/marvell/octeontx2/af/rvu.c:1053:6: warning: variable 'devnum' set but not used [-Wunused-but-set-variable] It never used since introduction in commit 746ea74241fa ("octeontx2-af: Add RVU block LF provisioning support") Signed-off-by: YueHaibing Signed-off-by: David S. Miller --- .../net/ethernet/marvell/octeontx2/af/rvu.c | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c index c06cca9c9e1a..60b3623eaef0 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c @@ -914,18 +914,9 @@ static int rvu_detach_rsrcs(struct rvu *rvu, struct rsrc_detach *detach, u16 pcifunc) { struct rvu_hwinfo *hw = rvu->hw; - bool is_pf, detach_all = true; + bool detach_all = true; struct rvu_block *block; - int devnum, blkid; - - /* Check if this is for a RVU PF or VF */ - if (pcifunc & RVU_PFVF_FUNC_MASK) { - is_pf = false; - devnum = rvu_get_hwvf(rvu, pcifunc); - } else { - is_pf = true; - devnum = rvu_get_pf(pcifunc); - } + int blkid; spin_lock(&rvu->rsrc_lock); @@ -1114,22 +1105,12 @@ static int rvu_mbox_handler_ATTACH_RESOURCES(struct rvu *rvu, struct msg_rsp *rsp) { u16 pcifunc = attach->hdr.pcifunc; - int devnum, err; - bool is_pf; + int err; /* If first request, detach all existing attached resources */ if (!attach->modify) rvu_detach_rsrcs(rvu, NULL, pcifunc); - /* Check if this is for a RVU PF or VF */ - if (pcifunc & RVU_PFVF_FUNC_MASK) { - is_pf = false; - devnum = rvu_get_hwvf(rvu, pcifunc); - } else { - is_pf = true; - devnum = rvu_get_pf(pcifunc); - } - spin_lock(&rvu->rsrc_lock); /* Check if the request can be accommodated */ -- 2.39.5