staging: rtlwifi: Use proper enumerated types for Wi-Fi only interface
PATCH 1/1 staging: rtlwifi: Use proper enumerated types for Wi-Fi only interface
Clang warns when one enumerated type is implicitly converted to another.
drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c:1264: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/staging/rtlwifi/btcoexist/halbtcoutsrc.c:1267: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/staging/rtlwifi/btcoexist/halbtcoutsrc.c:1270: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 = 0BTC_INTF_PCI = WIFIONLY_INTF_PCI = 0BTC_INTF_USB = WIFIONLY_INTF_USB = 0
--- drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c +3 -3
@@ -1261,13 +1261,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 ; }
Signature · 1 line
2.19.0
Quoted 20 lines · Nathan Chancellor
Clang warns when one enumerated type is implicitly converted to another.
drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c:1264:34: warning:
implicit conversion from enumeration type 'enumbtc_chip_interface' to different enumeration type 'enumwifionly_chip_interface' [-Wenum-conversion]wifionly_cfg->chip_interface = BTC_INTF_PCI; ~ ^~~~~~~~~~~~
drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c:1267:34: warning:
implicit conversion from enumeration type 'enumbtc_chip_interface' to different enumeration type 'enumwifionly_chip_interface' [-Wenum-conversion]wifionly_cfg->chip_interface = BTC_INTF_USB; ~ ^~~~~~~~~~~~
drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c:1270:34: warning:
implicit conversion from enumeration type 'enumbtc_chip_interface' to different enumeration type 'enumwifionly_chip_interface' [-Wenum-conversion]wifionly_cfg->chip_interface = BTC_INTF_UNKNOWN; ~ ^~~~~~~~~~~~~~~~
Quoted 8 lines
3 warnings generated.
Use the values from the correct enumerated type,
wifionly_chip_interface.
BTC_INTF_UNKNOWN=WIFIONLY_INTF_UNKNOWN= 0BTC_INTF_PCI=WIFIONLY_INTF_PCI= 0BTC_INTF_USB=WIFIONLY_INTF_USB= 0
I have sent a v2 making these values correct.
I will make sure the '--in-reply-to' option in the future.
Nathan
Quoted 30 lines
Signed-off-by Nathan Chancellor <[email protected]>--- drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c +3
-3@@ -1261,13 +1261,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 ; }Signature · 1 line
2.19.0