| Message ID | 20220318030025.12890-1-alexander.vorwerk@stud.uni-goettingen.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | iwlegacy: 4965-rs: remove three unused variables | expand |
Alexander Vorwerk <alexander.vorwerk@stud.uni-goettingen.de> wrote: > The following warnings showed up when compiling with W=1. > > drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function ‘il4965_rs_stay_in_table’: > drivers/net/wireless/intel/iwlegacy/4965-rs.c:1636:18: warning: variable ‘il’ set but not used [-Wunused-but-set-variable] > struct il_priv *il; > ^~ > drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function ‘il4965_rs_alloc_sta’: > drivers/net/wireless/intel/iwlegacy/4965-rs.c:2257:18: warning: variable ‘il’ set but not used [-Wunused-but-set-variable] > struct il_priv *il; > ^~ > drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function ‘il4965_rs_sta_dbgfs_scale_table_write’: > drivers/net/wireless/intel/iwlegacy/4965-rs.c:2535:18: warning: variable ‘il’ set but not used [-Wunused-but-set-variable] > struct il_priv *il; > ^~ > > Fixing by removing the variables. > > Signed-off-by: Alexander Vorwerk <alexander.vorwerk@stud.uni-goettingen.de> Please compile test your patches: In file included from drivers/net/wireless/intel/iwlegacy/4965-rs.c:22: drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function 'il4965_rs_stay_in_table': drivers/net/wireless/intel/iwlegacy/common.h:2927:32: error: 'il' undeclared (first use in this function); did you mean 'i'? 2927 | if (il_get_debug_level(il) & level) \ | ^~ drivers/net/wireless/intel/iwlegacy/common.h:3043:33: note: in expansion of macro 'IL_DBG' 3043 | #define D_RATE(f, a...) IL_DBG(IL_DL_RATE, f, ## a) | ^~~~~~ drivers/net/wireless/intel/iwlegacy/4965-rs.c:1664:25: note: in expansion of macro 'D_RATE' 1664 | D_RATE("LQ: stay is expired %d %d %d\n", | ^~~~~~ drivers/net/wireless/intel/iwlegacy/common.h:2927:32: note: each undeclared identifier is reported only once for each function it appears in 2927 | if (il_get_debug_level(il) & level) \ | ^~ drivers/net/wireless/intel/iwlegacy/common.h:3043:33: note: in expansion of macro 'IL_DBG' 3043 | #define D_RATE(f, a...) IL_DBG(IL_DL_RATE, f, ## a) | ^~~~~~ drivers/net/wireless/intel/iwlegacy/4965-rs.c:1664:25: note: in expansion of macro 'D_RATE' 1664 | D_RATE("LQ: stay is expired %d %d %d\n", | ^~~~~~ drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function 'il4965_rs_alloc_sta': drivers/net/wireless/intel/iwlegacy/common.h:2927:32: error: 'il' undeclared (first use in this function); did you mean 'inl'? 2927 | if (il_get_debug_level(il) & level) \ | ^~ drivers/net/wireless/intel/iwlegacy/common.h:3043:33: note: in expansion of macro 'IL_DBG' 3043 | #define D_RATE(f, a...) IL_DBG(IL_DL_RATE, f, ## a) | ^~~~~~ drivers/net/wireless/intel/iwlegacy/4965-rs.c:2256:9: note: in expansion of macro 'D_RATE' 2256 | D_RATE("create station rate scale win\n"); | ^~~~~~ drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function 'il4965_rs_sta_dbgfs_scale_table_write': drivers/net/wireless/intel/iwlegacy/common.h:2927:32: error: 'il' undeclared (first use in this function); did you mean 'inl'? 2927 | if (il_get_debug_level(il) & level) \ | ^~ drivers/net/wireless/intel/iwlegacy/common.h:3043:33: note: in expansion of macro 'IL_DBG' 3043 | #define D_RATE(f, a...) IL_DBG(IL_DL_RATE, f, ## a) | ^~~~~~ drivers/net/wireless/intel/iwlegacy/4965-rs.c:2549:9: note: in expansion of macro 'D_RATE' 2549 | D_RATE("sta_id %d rate 0x%X\n", lq_sta->lq.sta_id, | ^~~~~~ make[5]: *** [scripts/Makefile.build:288: drivers/net/wireless/intel/iwlegacy/4965-rs.o] Error 1 make[4]: *** [scripts/Makefile.build:550: drivers/net/wireless/intel/iwlegacy] Error 2 make[3]: *** [scripts/Makefile.build:550: drivers/net/wireless/intel] Error 2 make[2]: *** [scripts/Makefile.build:550: drivers/net/wireless] Error 2 make[1]: *** [scripts/Makefile.build:550: drivers/net] Error 2 make: *** [Makefile:1834: drivers] Error 2 Patch set to Changes Requested.
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-rs.c b/drivers/net/wireless/intel/iwlegacy/4965-rs.c index 9a491e5db75b..5e4110a1e644 100644 --- a/drivers/net/wireless/intel/iwlegacy/4965-rs.c +++ b/drivers/net/wireless/intel/iwlegacy/4965-rs.c @@ -1633,9 +1633,7 @@ il4965_rs_stay_in_table(struct il_lq_sta *lq_sta, bool force_search) int i; int active_tbl; int flush_interval_passed = 0; - struct il_priv *il; - il = lq_sta->drv; active_tbl = lq_sta->active_tbl; tbl = &(lq_sta->lq_info[active_tbl]); @@ -2254,9 +2252,7 @@ il4965_rs_alloc_sta(void *il_rate, struct ieee80211_sta *sta, gfp_t gfp) { struct il_station_priv *sta_priv = (struct il_station_priv *)sta->drv_priv; - struct il_priv *il; - il = (struct il_priv *)il_rate; D_RATE("create station rate scale win\n"); return &sta_priv->lq_sta; @@ -2532,12 +2528,10 @@ il4965_rs_sta_dbgfs_scale_table_write(struct file *file, size_t count, loff_t *ppos) { struct il_lq_sta *lq_sta = file->private_data; - struct il_priv *il; char buf[64]; size_t buf_size; u32 parsed_rate; - il = lq_sta->drv; memset(buf, 0, sizeof(buf)); buf_size = min(count, sizeof(buf) - 1); if (copy_from_user(buf, user_buf, buf_size))
The following warnings showed up when compiling with W=1. drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function ‘il4965_rs_stay_in_table’: drivers/net/wireless/intel/iwlegacy/4965-rs.c:1636:18: warning: variable ‘il’ set but not used [-Wunused-but-set-variable] struct il_priv *il; ^~ drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function ‘il4965_rs_alloc_sta’: drivers/net/wireless/intel/iwlegacy/4965-rs.c:2257:18: warning: variable ‘il’ set but not used [-Wunused-but-set-variable] struct il_priv *il; ^~ drivers/net/wireless/intel/iwlegacy/4965-rs.c: In function ‘il4965_rs_sta_dbgfs_scale_table_write’: drivers/net/wireless/intel/iwlegacy/4965-rs.c:2535:18: warning: variable ‘il’ set but not used [-Wunused-but-set-variable] struct il_priv *il; ^~ Fixing by removing the variables. Signed-off-by: Alexander Vorwerk <alexander.vorwerk@stud.uni-goettingen.de> --- drivers/net/wireless/intel/iwlegacy/4965-rs.c | 6 ------ 1 file changed, 6 deletions(-)