| Message ID | 20190614171713.89262-1-nhuck@google.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | wl18xx: Fix Wunused-const-variable | expand |
On Fri, Jun 14, 2019 at 10:17 AM 'Nathan Huckleberry' via Clang Built Linux <clang-built-linux@googlegroups.com> wrote: > > Clang produces the following warning > > drivers/net/wireless/ti/wl18xx/main.c:1850:43: warning: unused variable > 'wl18xx_iface_ap_cl_limits' [-Wunused-const-variable] static const struct > ieee80211_iface_limit wl18xx_iface_ap_cl_limits[] = { ^ > drivers/net/wireless/ti/wl18xx/main.c:1869:43: warning: unused variable > 'wl18xx_iface_ap_go_limits' [-Wunused-const-variable] static const struct > ieee80211_iface_limit wl18xx_iface_ap_go_limits[] = { ^ > > The commit that added these variables never used them. Removing them. Previous thread, for context: https://groups.google.com/forum/#!topic/clang-built-linux/1Lu1GT9ic94 Looking at drivers/net/wireless/ti/wl18xx/main.c, there 4 globally declared `struct ieee80211_iface_limit` but as your patch notes, only 2 are used. The thing is, their uses are in a `struct ieee80211_iface_limit []`. Looking at $ git blame drivers/net/wireless/ti/wl18xx/main.c -L 1850 points to commit 7845af35e0de ("wlcore: add p2p device support") Adding Eliad and Arik to the thread; it's not clear to me what the these variables were supposed to do, but seeing as the code in question was already dead, this is no functional change from a user's perspective. With that in mind: Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> So I'd at least add the tag. Fixes: 7845af35e0de ("wlcore: add p2p device support") > --- a/drivers/net/wireless/ti/wl18xx/main.c > +++ b/drivers/net/wireless/ti/wl18xx/main.c > @@ -1847,44 +1847,6 @@ static const struct ieee80211_iface_limit wl18xx_iface_ap_limits[] = { > }, > }; > > -static const struct ieee80211_iface_limit wl18xx_iface_ap_cl_limits[] = { > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_STATION), > - }, > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_AP), > - }, > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_P2P_CLIENT), > - }, > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_P2P_DEVICE), > - }, > -}; > - > -static const struct ieee80211_iface_limit wl18xx_iface_ap_go_limits[] = { > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_STATION), > - }, > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_AP), > - }, > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_P2P_GO), > - }, > - { > - .max = 1, > - .types = BIT(NL80211_IFTYPE_P2P_DEVICE), > - }, > -}; > -
On Fri, Jun 14, 2019 at 1:54 PM Nick Desaulniers <ndesaulniers@google.com> wrote: > Looking at drivers/net/wireless/ti/wl18xx/main.c, there 4 globally > declared `struct ieee80211_iface_limit` but as your patch notes, only > 2 are used. The thing is, their uses are in a `struct > ieee80211_iface_limit []`. Sorry, that's not quite right; it's not a `struct ieee80211_iface_limit []` but a `struct ieee80211_iface_combination []`. No idea what other values we'd put to add these limits to the array.
Nick Desaulniers <ndesaulniers@google.com> writes: > On Fri, Jun 14, 2019 at 10:17 AM 'Nathan Huckleberry' via Clang Built > Linux <clang-built-linux@googlegroups.com> wrote: >> >> Clang produces the following warning >> >> drivers/net/wireless/ti/wl18xx/main.c:1850:43: warning: unused variable >> 'wl18xx_iface_ap_cl_limits' [-Wunused-const-variable] static const struct >> ieee80211_iface_limit wl18xx_iface_ap_cl_limits[] = { ^ >> drivers/net/wireless/ti/wl18xx/main.c:1869:43: warning: unused variable >> 'wl18xx_iface_ap_go_limits' [-Wunused-const-variable] static const struct >> ieee80211_iface_limit wl18xx_iface_ap_go_limits[] = { ^ >> >> The commit that added these variables never used them. Removing them. > > Previous thread, for context: > https://groups.google.com/forum/#!topic/clang-built-linux/1Lu1GT9ic94 > > Looking at drivers/net/wireless/ti/wl18xx/main.c, there 4 globally > declared `struct ieee80211_iface_limit` but as your patch notes, only > 2 are used. The thing is, their uses are in a `struct > ieee80211_iface_limit []`. > > Looking at > $ git blame drivers/net/wireless/ti/wl18xx/main.c -L 1850 > points to > commit 7845af35e0de ("wlcore: add p2p device support") > Adding Eliad and Arik to the thread; it's not clear to me what the > these variables were supposed to do, but seeing as the code in > question was already dead, this is no functional change from a user's > perspective. With that in mind: > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > > So I'd at least add the tag. > Fixes: 7845af35e0de ("wlcore: add p2p device support") I can't see any functional changes when applying this patch so I don't think a fixes line is needed, it's just cleanup.
Nathan Huckleberry <nhuck@google.com> wrote: > Clang produces the following warning > > drivers/net/wireless/ti/wl18xx/main.c:1850:43: warning: unused variable > 'wl18xx_iface_ap_cl_limits' [-Wunused-const-variable] static const struct > ieee80211_iface_limit wl18xx_iface_ap_cl_limits[] = { ^ > drivers/net/wireless/ti/wl18xx/main.c:1869:43: warning: unused variable > 'wl18xx_iface_ap_go_limits' [-Wunused-const-variable] static const struct > ieee80211_iface_limit wl18xx_iface_ap_go_limits[] = { ^ > > The commit that added these variables never used them. Removing them. > > Cc: clang-built-linux@googlegroups.com > Link: https://github.com/ClangBuiltLinux/linux/issues/530 > Signed-off-by: Nathan Huckleberry <nhuck@google.com> > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Patch applied to wireless-drivers.git, thanks. 608fd7214323 wl18xx: Fix Wunused-const-variable
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c index a5e0604d3009..0b3cf8477c6c 100644 --- a/drivers/net/wireless/ti/wl18xx/main.c +++ b/drivers/net/wireless/ti/wl18xx/main.c @@ -1847,44 +1847,6 @@ static const struct ieee80211_iface_limit wl18xx_iface_ap_limits[] = { }, }; -static const struct ieee80211_iface_limit wl18xx_iface_ap_cl_limits[] = { - { - .max = 1, - .types = BIT(NL80211_IFTYPE_STATION), - }, - { - .max = 1, - .types = BIT(NL80211_IFTYPE_AP), - }, - { - .max = 1, - .types = BIT(NL80211_IFTYPE_P2P_CLIENT), - }, - { - .max = 1, - .types = BIT(NL80211_IFTYPE_P2P_DEVICE), - }, -}; - -static const struct ieee80211_iface_limit wl18xx_iface_ap_go_limits[] = { - { - .max = 1, - .types = BIT(NL80211_IFTYPE_STATION), - }, - { - .max = 1, - .types = BIT(NL80211_IFTYPE_AP), - }, - { - .max = 1, - .types = BIT(NL80211_IFTYPE_P2P_GO), - }, - { - .max = 1, - .types = BIT(NL80211_IFTYPE_P2P_DEVICE), - }, -}; - static const struct ieee80211_iface_combination wl18xx_iface_combinations[] = { {
Clang produces the following warning drivers/net/wireless/ti/wl18xx/main.c:1850:43: warning: unused variable 'wl18xx_iface_ap_cl_limits' [-Wunused-const-variable] static const struct ieee80211_iface_limit wl18xx_iface_ap_cl_limits[] = { ^ drivers/net/wireless/ti/wl18xx/main.c:1869:43: warning: unused variable 'wl18xx_iface_ap_go_limits' [-Wunused-const-variable] static const struct ieee80211_iface_limit wl18xx_iface_ap_go_limits[] = { ^ The commit that added these variables never used them. Removing them. Cc: clang-built-linux@googlegroups.com Link: https://github.com/ClangBuiltLinux/linux/issues/530 Signed-off-by: Nathan Huckleberry <nhuck@google.com> --- drivers/net/wireless/ti/wl18xx/main.c | 38 --------------------------- 1 file changed, 38 deletions(-)