aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8723bs
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2019-10-09 14:32:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-10 10:51:19 +0200
commit44bcfb27d29ecc71e24f98bf8fecb41e9556b270 (patch)
treeaaa5f4ea5b5add853e6d259b600e600576c77e67 /drivers/staging/rtl8723bs
parentstaging: rtl8723bs: Remove phy_Config*WithParaFile() configuration leftovers (diff)
downloadlinux-dev-44bcfb27d29ecc71e24f98bf8fecb41e9556b270.tar.xz
linux-dev-44bcfb27d29ecc71e24f98bf8fecb41e9556b270.zip
staging: rtl8723bs: Remove rtw_merge_string() function
The phy_Config*WithParaFile() functions were the only user of this function. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20191009123223.163241-4-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs')
-rw-r--r--drivers/staging/rtl8723bs/include/osdep_service_linux.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
index c582ede1ac12..a2d9de866c4b 100644
--- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h
+++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
@@ -127,13 +127,6 @@ static inline void rtw_netif_stop_queue(struct net_device *pnetdev)
netif_tx_stop_all_queues(pnetdev);
}
-static inline void rtw_merge_string(char *dst, int dst_len, char *src1, char *src2)
-{
- int len = 0;
- len += snprintf(dst+len, dst_len - len, "%s", src1);
- len += snprintf(dst+len, dst_len - len, "%s", src2);
-}
-
#define rtw_signal_process(pid, sig) kill_pid(find_vpid((pid)), (sig), 1)
#define rtw_netdev_priv(netdev) (((struct rtw_netdev_priv_indicator *)netdev_priv(netdev))->priv)