rtlwifi: btcoex: move bt_type declaration

Ping-Ke Shih · Kalle Valo · commit e0215c142026 · 2017-02-07T09:25:08.000+02:00
Routine rtl_get_hwpg_bt_type() is better in halbtcoutsrc.c than in
rtl_btc.c.

Signed-off-by: Ping-Ke Shih &lt;pkshih@realtek.com&gt;
Signed-off-by: Larry Finger &lt;Larry.Finger@lwfinger.net&gt;
Signed-off-by: Kalle Valo &lt;kvalo@codeaurora.org&gt;
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -151,6 +151,11 @@ u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv)
 	return rtlpriv->btcoexist.btc_info.single_ant_path;
 }
 
+u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv)
+{
+	return rtlpriv->btcoexist.btc_info.bt_type;
+}
+
 u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv)
 {
 	u8 num;
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
@@ -198,11 +198,6 @@ u8 rtl_get_hwpg_bt_exist(struct rtl_priv *rtlpriv)
 	return rtlpriv->btcoexist.btc_info.btcoexist;
 }
 
-u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv)
-{
-	return rtlpriv->btcoexist.btc_info.bt_type;
-}
-
 MODULE_AUTHOR("Page He	<page_he@realsil.com.cn>");
 MODULE_AUTHOR("Realtek WlanFAE	<wlanfae@realtek.com>");
 MODULE_AUTHOR("Larry Finger	<Larry.FInger@lwfinger.net>");

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,11 @@ u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv)`
`151`	`151`	`return rtlpriv->btcoexist.btc_info.single_ant_path;`
`152`	`152`	`}`
`153`	`153`
	`154`	`+u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv)`
	`155`	`+{`
	`156`	`+ return rtlpriv->btcoexist.btc_info.bt_type;`
	`157`	`+}`
	`158`	`+`
`154`	`159`	`u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv)`
`155`	`160`	`{`
`156`	`161`	`u8 num;`
-Original file line number
+Diff line change
 	return rtlpriv->btcoexist.btc_info.btcoexist;
+}
 -u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv)
 -{
 -	return rtlpriv->btcoexist.btc_info.bt_type;
 -}
+-
 MODULE_AUTHOR("Page He	<[email protected]>");
 MODULE_AUTHOR("Realtek WlanFAE	<[email protected]>");
 MODULE_AUTHOR("Larry Finger	<[email protected]>");