staging: rtl8192e: Replace macro iwe_stream_add_point_rsl with standard function

Replace macro iwe_stream_add_point_rsl with standard function
iwe_stream_add_point to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/563af664b3186e73d99f73a6396f8ebcd3c52be2.1679504314.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 81d630c..1ce4c29 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -65,9 +65,6 @@
 #define container_of_dwork_rsl(x, y, z)                                \
        container_of(to_delayed_work(x), y, z)
 
-#define iwe_stream_add_point_rsl(info, start, stop, iwe, p)    \
-       iwe_stream_add_point(info, start, stop, iwe, p)
-
 static inline void *netdev_priv_rsl(struct net_device *dev)
 {
        return netdev_priv(dev);

diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index e580cd0..d6691f3 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -49,16 +49,13 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
        iwe.u.data.flags = 1;
        if (network->ssid_len > 0) {
                iwe.u.data.length = min_t(u8, network->ssid_len, 32);
-               start = iwe_stream_add_point_rsl(info, start, stop, &iwe,
-                                                network->ssid);
+               start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid);
        } else if (network->hidden_ssid_len == 0) {
                iwe.u.data.length = sizeof("<hidden>");
-               start = iwe_stream_add_point_rsl(info, start, stop,
-                                                &iwe, "<hidden>");
+               start = iwe_stream_add_point(info, start, stop, &iwe, "<hidden>");
        } else {
                iwe.u.data.length = min_t(u8, network->hidden_ssid_len, 32);
-               start = iwe_stream_add_point_rsl(info, start, stop, &iwe,
-                                                network->hidden_ssid);
+               start = iwe_stream_add_point(info, start, stop, &iwe, network->hidden_ssid);
        }
        /* Add the protocol name */
        iwe.cmd = SIOCGIWNAME;
@@ -96,8 +93,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
        else
                iwe.u.data.flags = IW_ENCODE_DISABLED;
        iwe.u.data.length = 0;
-       start = iwe_stream_add_point_rsl(info, start, stop,
-                                        &iwe, network->ssid);
+       start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid);
        /* Add basic and extended rates */
        max_rate = 0;
        p = custom;
@@ -152,8 +148,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
        iwe.cmd = IWEVCUSTOM;
        iwe.u.data.length = p - custom;
        if (iwe.u.data.length)
-               start = iwe_stream_add_point_rsl(info, start, stop,
-                                                &iwe, custom);
+               start = iwe_stream_add_point(info, start, stop, &iwe, custom);
        /* Add quality statistics */
        /* TODO: Fix these values... */
        iwe.cmd = IWEVQUAL;
@@ -174,7 +169,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
        p = custom;
        iwe.u.data.length = p - custom;
        if (iwe.u.data.length)
-               start = iwe_stream_add_point_rsl(info, start, stop, &iwe, custom);
+               start = iwe_stream_add_point(info, start, stop, &iwe, custom);
 
        memset(&iwe, 0, sizeof(iwe));
        if (network->wpa_ie_len) {
@@ -183,7 +178,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
                memcpy(buf, network->wpa_ie, network->wpa_ie_len);
                iwe.cmd = IWEVGENIE;
                iwe.u.data.length = network->wpa_ie_len;
-               start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf);
+               start = iwe_stream_add_point(info, start, stop, &iwe, buf);
        }
        memset(&iwe, 0, sizeof(iwe));
        if (network->rsn_ie_len) {
@@ -192,7 +187,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
                memcpy(buf, network->rsn_ie, network->rsn_ie_len);
                iwe.cmd = IWEVGENIE;
                iwe.u.data.length = network->rsn_ie_len;
-               start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf);
+               start = iwe_stream_add_point(info, start, stop, &iwe, buf);
        }
 
        /* add info for WZC */
@@ -203,7 +198,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
                memcpy(buf, network->wzc_ie, network->wzc_ie_len);
                iwe.cmd = IWEVGENIE;
                iwe.u.data.length = network->wzc_ie_len;
-               start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf);
+               start = iwe_stream_add_point(info, start, stop, &iwe, buf);
        }
 
        /* Add EXTRA: Age to display seconds since last beacon/probe response
@@ -216,8 +211,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
                      (100 * (jiffies - network->last_scanned)) / HZ);
        iwe.u.data.length = p - custom;
        if (iwe.u.data.length)
-               start = iwe_stream_add_point_rsl(info, start, stop,
-                                                &iwe, custom);
+               start = iwe_stream_add_point(info, start, stop, &iwe, custom);
 
        return start;
 }