staging: rtl8192e: Replace macro container_of_work_rsl with standard macro

Replace macro container_of_work_rsl with standard macro container_of to
increase readability.

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

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index ea07b350b62a206ebcb5ebfe5b28ae57e0f72349..3244aef12c05d189062c127a793eb6e4a8ea8c21 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -311,8 +311,7 @@ static const struct rtllib_qos_parameters def_qos_parameters = {
 
 static void _rtl92e_update_beacon(void *data)
 {
-       struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
-                                 update_beacon_wq.work);
+       struct r8192_priv *priv = container_of(data, struct r8192_priv, update_beacon_wq.work);
        struct net_device *dev = priv->rtllib->dev;
        struct rtllib_device *ieee = priv->rtllib;
        struct rtllib_network *net = &ieee->current_network;
@@ -326,8 +325,7 @@ static void _rtl92e_update_beacon(void *data)
 
 static void _rtl92e_qos_activate(void *data)
 {
-       struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
-                                 qos_activate);
+       struct r8192_priv *priv = container_of(data, struct r8192_priv, qos_activate);
        struct net_device *dev = priv->rtllib->dev;
        int i;
 
@@ -2033,8 +2031,7 @@ void rtl92e_commit(struct net_device *dev)
 
 static void _rtl92e_restart(void *data)
 {
-       struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
-                                 reset_wq);
+       struct r8192_priv *priv = container_of(data, struct r8192_priv, reset_wq);
        struct net_device *dev = priv->rtllib->dev;
 
        mutex_lock(&priv->wx_mutex);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index ef4f736ce325586dfaabdb035a55ba8cfb13ac37..5a1cd22f5e2522e302693b4952e440d81f8b1d24 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -142,8 +142,7 @@ void rtl92e_ips_leave(struct net_device *dev)
 
 void rtl92e_ips_leave_wq(void *data)
 {
-       struct rtllib_device *ieee = container_of_work_rsl(data,
-                                    struct rtllib_device, ips_leave_wq);
+       struct rtllib_device *ieee = container_of(data, struct rtllib_device, ips_leave_wq);
        struct net_device *dev = ieee->dev;
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index aa39f8b2bf09b25a0fcd0e5afdb2fda5652ed7ca..669a9d9a5d18d6fd6e8c6f378489608ba40429d1 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -62,7 +62,6 @@
 #define IW_CUSTOM_MAX  256     /* In bytes */
 #endif
 
-#define container_of_work_rsl(x, y, z) container_of(x, y, z)
 #define container_of_dwork_rsl(x, y, z)                                \
        container_of(to_delayed_work(x), y, z)
 

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 91fb5f150a00303f5ac7813ae25ce8d04786a98e..b9886e83a6dc928d242f25f6631c86569e9a68fa 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1498,7 +1498,7 @@ static void rtllib_associate_step2(struct rtllib_device *ieee)
 static void rtllib_associate_complete_wq(void *data)
 {
        struct rtllib_device *ieee = (struct rtllib_device *)
-                                    container_of_work_rsl(data,
+                                    container_of(data,
                                     struct rtllib_device,
                                     associate_complete_wq);
        struct rt_pwr_save_ctrl *psc = &ieee->pwr_save_ctrl;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 06f1d6de5cc758c10daffefc2780e59829829cd1..1f2fa711e60b466573066326cd1731c9f52ab907 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -326,8 +326,7 @@ EXPORT_SYMBOL(rtllib_wx_set_mode);
 
 void rtllib_wx_sync_scan_wq(void *data)
 {
-       struct rtllib_device *ieee = container_of_work_rsl(data,
-                                    struct rtllib_device, wx_sync_scan_wq);
+       struct rtllib_device *ieee = container_of(data, struct rtllib_device, wx_sync_scan_wq);
        short chan;
        enum ht_extchnl_offset chan_offset = 0;
        enum ht_channel_width bandwidth = 0;