From bf8d1ecccb297b81bcca980dcd04fc1fb74d4209 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 27 Mar 2023 23:02:19 +0200 Subject: [PATCH] staging: rtl8192e: Remove rtl92e_config_phy Remove rtl92e_config_phy to improve readability. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/5c433417b4e8e96a70c23a03bec30d26e45791d0.1679949171.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 9 --------- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 1eb063fe660a..f4fdaeff2917 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -691,7 +691,7 @@ start: } if (priv->rst_progress == RESET_TYPE_NORESET) { - rtStatus = rtl92e_config_phy(dev); + rtStatus = rtl92e_config_rf(dev); if (!rtStatus) { netdev_info(dev, "RF Config failed\n"); return rtStatus; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index bd302f5cb356..139d8268c8dc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -468,15 +468,6 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel) rtl92e_set_ofdm_tx_power(dev, powerlevelOFDM24G); } -bool rtl92e_config_phy(struct net_device *dev) -{ - bool rtStatus = true; - - rtStatus = rtl92e_config_rf(dev); - - return rtStatus; -} - u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h index 498da6be3e4e..6c4c33ded6a9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -39,7 +39,6 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, bool rtl92e_config_bb(struct net_device *dev); void rtl92e_get_tx_power(struct net_device *dev); void rtl92e_set_tx_power(struct net_device *dev, u8 channel); -bool rtl92e_config_phy(struct net_device *dev); u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath); u8 rtl92e_set_channel(struct net_device *dev, u8 channel); -- 2.11.0