| Message ID | 20180923063114.11446-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 31138a827d1b3d6e4855bddb5a1e44e7b32309c0 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] rtlwifi: btcoex: Use proper enumerated types for Wi-Fi only interface | expand |
On Sat, 2018-09-22 at 23:31 -0700, Nathan Chancellor wrote: > Clang warns when one enumerated type is implicitly converted to another. > > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1327:34: > warning: implicit conversion from enumeration type 'enum > btc_chip_interface' to different enumeration type 'enum > wifionly_chip_interface' [-Wenum-conversion] > wifionly_cfg->chip_interface = BTC_INTF_PCI; > ~ ^~~~~~~~~~~~ > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1330:34: > warning: implicit conversion from enumeration type 'enum > btc_chip_interface' to different enumeration type 'enum > wifionly_chip_interface' [-Wenum-conversion] > wifionly_cfg->chip_interface = BTC_INTF_USB; > ~ ^~~~~~~~~~~~ > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1333:34: > warning: implicit conversion from enumeration type 'enum > btc_chip_interface' to different enumeration type 'enum > wifionly_chip_interface' [-Wenum-conversion] > wifionly_cfg->chip_interface = BTC_INTF_UNKNOWN; > ~ ^~~~~~~~~~~~~~~~ > 3 warnings generated. > > Use the values from the correct enumerated type, wifionly_chip_interface. > > BTC_INTF_UNKNOWN = WIFIONLY_INTF_UNKNOWN = 0 > BTC_INTF_PCI = WIFIONLY_INTF_PCI = 1 > BTC_INTF_USB = WIFIONLY_INTF_USB = 2 > > Link: https://github.com/ClangBuiltLinux/linux/issues/135 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Nathan Chancellor <natechancellor@gmail.com> wrote: > Clang warns when one enumerated type is implicitly converted to another. > > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1327:34: > warning: implicit conversion from enumeration type 'enum > btc_chip_interface' to different enumeration type 'enum > wifionly_chip_interface' [-Wenum-conversion] > wifionly_cfg->chip_interface = BTC_INTF_PCI; > ~ ^~~~~~~~~~~~ > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1330:34: > warning: implicit conversion from enumeration type 'enum > btc_chip_interface' to different enumeration type 'enum > wifionly_chip_interface' [-Wenum-conversion] > wifionly_cfg->chip_interface = BTC_INTF_USB; > ~ ^~~~~~~~~~~~ > drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1333:34: > warning: implicit conversion from enumeration type 'enum > btc_chip_interface' to different enumeration type 'enum > wifionly_chip_interface' [-Wenum-conversion] > wifionly_cfg->chip_interface = BTC_INTF_UNKNOWN; > ~ ^~~~~~~~~~~~~~~~ > 3 warnings generated. > > Use the values from the correct enumerated type, wifionly_chip_interface. > > BTC_INTF_UNKNOWN = WIFIONLY_INTF_UNKNOWN = 0 > BTC_INTF_PCI = WIFIONLY_INTF_PCI = 1 > BTC_INTF_USB = WIFIONLY_INTF_USB = 2 > > Link: https://github.com/ClangBuiltLinux/linux/issues/135 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > Acked-by: Ping-Ke Shih <pkshih@realtek.com> Patch applied to wireless-drivers-next.git, thanks. 31138a827d1b rtlwifi: btcoex: Use proper enumerated types for Wi-Fi only interface
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index b026e80940a4..6fbf8845a2ab 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -1324,13 +1324,13 @@ bool exhalbtc_initlize_variables_wifi_only(struct rtl_priv *rtlpriv) switch (rtlpriv->rtlhal.interface) { case INTF_PCI: - wifionly_cfg->chip_interface = BTC_INTF_PCI; + wifionly_cfg->chip_interface = WIFIONLY_INTF_PCI; break; case INTF_USB: - wifionly_cfg->chip_interface = BTC_INTF_USB; + wifionly_cfg->chip_interface = WIFIONLY_INTF_USB; break; default: - wifionly_cfg->chip_interface = BTC_INTF_UNKNOWN; + wifionly_cfg->chip_interface = WIFIONLY_INTF_UNKNOWN; break; }
Clang warns when one enumerated type is implicitly converted to another. drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1327:34: warning: implicit conversion from enumeration type 'enum btc_chip_interface' to different enumeration type 'enum wifionly_chip_interface' [-Wenum-conversion] wifionly_cfg->chip_interface = BTC_INTF_PCI; ~ ^~~~~~~~~~~~ drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1330:34: warning: implicit conversion from enumeration type 'enum btc_chip_interface' to different enumeration type 'enum wifionly_chip_interface' [-Wenum-conversion] wifionly_cfg->chip_interface = BTC_INTF_USB; ~ ^~~~~~~~~~~~ drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c:1333:34: warning: implicit conversion from enumeration type 'enum btc_chip_interface' to different enumeration type 'enum wifionly_chip_interface' [-Wenum-conversion] wifionly_cfg->chip_interface = BTC_INTF_UNKNOWN; ~ ^~~~~~~~~~~~~~~~ 3 warnings generated. Use the values from the correct enumerated type, wifionly_chip_interface. BTC_INTF_UNKNOWN = WIFIONLY_INTF_UNKNOWN = 0 BTC_INTF_PCI = WIFIONLY_INTF_PCI = 1 BTC_INTF_USB = WIFIONLY_INTF_USB = 2 Link: https://github.com/ClangBuiltLinux/linux/issues/135 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- v1 -> v2: * Fix enum values in commit message (previously all 0) .../net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)