Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31138a82 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Kalle Valo
Browse files

rtlwifi: btcoex: Use proper enumerated types for Wi-Fi only interface 

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: default avatarNathan Chancellor <natechancellor@gmail.com>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0891c7f4

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}