staging: rtl8192e: Replace macros in r8192E_phy.h
cover staging: rtl8192e: Replace macros in r8192E_phy.h
Remove unused variable or macro or replace custom macro with standard kernel macro or function.
Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
Philipp Hortmann (9):
staging: rtl8192e: Remove unused variable rtl819XAGCTAB_Array
staging: rtl8192e: Remove double defined constants bMaskBytex and
bMask..
staging: rtl8192e: Replace macro skb_tail_pointer_rsl with standard f.
staging: rtl8192e: Remove unused macro queue_delayed_work_rsl and
queu..
staging: rtl8192e: Replace macro INIT_DELAYED_WORK_RSL with standard
m.
staging: rtl8192e: Replace macro INIT_WORK_RSL with standard macro
staging: rtl8192e: Replace macro container_of_work_rsl with standard
f. staging: rtl8192e: Replace macro iwe_stream_add_event_rsl with
standard f.
staging: rtl8192e: Replace macro iwe_stream_add_point_rsl with
standard f.
.../staging/rtl8192e/rtl8192e/r8192E_phy.h | 10 ----- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 38 +++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 3 +- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 3 +- drivers/staging/rtl8192e/rtllib.h | 15 ------- drivers/staging/rtl8192e/rtllib_softmac.c | 23 ++++------ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 +- drivers/staging/rtl8192e/rtllib_wx.c | 42 +++++++------------ 8 files changed, 41 insertions(+), 96 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/9 staging: rtl8192e: Remove unused variable rtl819XAGCTAB_Array
Remove unused variable rtl819XAGCTAB_Array.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -2
@@ -9,8 +9,6 @@#define MAX_DOZE_WAITING_TIMES_9x 64 -extern u32 rtl819XAGCTAB_Array[]; -enum hw90_block {HW90_BLOCK_MAC =0 ,HW90_BLOCK_PHY0 =1 ,
Signature · 1 line
2.39.2
PATCH 2/9 staging: rtl8192e: Remove double defined constants bMaskBytex and bMask..
In reply to Philipp HortmannRemove double defined constants.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -8
@@ -25,14 +25,6 @@ enum rf90_radio_path { RF90_PATH_MAX }; -#define bMaskByte0 0xff -#define bMaskByte1 0xff00 -#define bMaskByte2 0xff0000 -#define bMaskByte3 0xff000000 -#define bMaskHWord 0xffff0000 -#define bMaskLWord 0x0000ffff -#define bMaskDWord 0xffffffff -void rtl92e_set_bb_reg (struct net_device *dev,u32 dwRegAddr,u32 dwBitMask,u32 dwData);u32 rtl92e_get_bb_reg (struct net_device *dev,u32 dwRegAddr,u32 dwBitMask);
Signature · 1 line
2.39.2
PATCH 3/9 staging: rtl8192e: Replace macro skb_tail_pointer_rsl with standard f.
In reply to Philipp HortmannReplace macro skb_tail_pointer_rsl with function skb_tail_pointer to increase readablility.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +2 -2
@@ -1653,7 +1653,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev) priv->rx_buf[rx_queue_idx][i] = skb; mapping = (dma_addr_t *)skb->cb; *mapping =dma_map_single (&priv->pdev->dev, -skb_tail_pointer_rsl (skb), +skb_tail_pointer (skb), priv->rxbuffersize,DMA_FROM_DEVICE );if (dma_mapping_error (&priv->pdev->dev, *mapping)) {dev_kfree_skb_any (skb);
@@ -1909,7 +1909,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] = skb; *((dma_addr_t *)skb->cb) =dma_map_single (&priv->pdev->dev, -skb_tail_pointer_rsl (skb), +skb_tail_pointer (skb), priv->rxbuffersize,DMA_FROM_DEVICE );if (dma_mapping_error (&priv->pdev->dev, *((dma_addr_t *)skb->cb))) {dev_kfree_skb_any (skb);
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -62,8 +62,6 @@#define IW_CUSTOM_MAX 256/* In bytes */ #endif -#define skb_tail_pointer_rsl (skb) skb_tail_pointer(skb) -#define queue_delayed_work_rsl (x, y, z) queue_delayed_work(x, y, z)#define INIT_DELAYED_WORK_RSL (x, y, z) INIT_DELAYED_WORK(x, y)
Signature · 1 line
2.39.2
PATCH 4/9 staging: rtl8192e: Remove unused macro queue_delayed_work_rsl and queu..
In reply to Philipp HortmannRemove unused macro queue_delayed_work_rsl and queue_work_rsl.
--- drivers/staging/rtl8192e/rtllib.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -62,10 +62,8 @@#define IW_CUSTOM_MAX 256/* In bytes */ #endif -#define queue_delayed_work_rsl (x, y, z) queue_delayed_work(x, y, z)#define INIT_DELAYED_WORK_RSL (x, y, z) INIT_DELAYED_WORK(x, y) -#define queue_work_rsl (x, y) queue_work(x, y)#define INIT_WORK_RSL (x, y, z) INIT_WORK(x, y)#define container_of_work_rsl (x, y, z) container_of(x, y, z)
Signature · 1 line
2.39.2
PATCH 5/9 staging: rtl8192e: Replace macro INIT_DELAYED_WORK_RSL with standard m.
In reply to Philipp HortmannReplace macro INIT_DELAYED_WORK_RSL with standard macro INIT_DELAYED_WORK to increase readability.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 18 ++++++------------ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 3 +-- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 15 +++++---------- 4 files changed, 12 insertions(+), 26 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +6 -12
@@ -893,19 +893,13 @@ static void _rtl92e_init_priv_task(struct net_device *dev)INIT_WORK_RSL (&priv->reset_wq, (void *)_rtl92e_restart, dev);INIT_WORK_RSL (&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq, dev); -INIT_DELAYED_WORK_RSL (&priv->watch_dog_wq, - (void *)_rtl92e_watchdog_wq_cb, dev); -INIT_DELAYED_WORK_RSL (&priv->txpower_tracking_wq, - (void *)rtl92e_dm_txpower_tracking_wq, dev); -INIT_DELAYED_WORK_RSL (&priv->rfpath_check_wq, - (void *)rtl92e_dm_rf_pathcheck_wq, dev); -INIT_DELAYED_WORK_RSL (&priv->update_beacon_wq, - (void *)_rtl92e_update_beacon, dev); +INIT_DELAYED_WORK (&priv->watch_dog_wq, (void *)_rtl92e_watchdog_wq_cb); +INIT_DELAYED_WORK (&priv->txpower_tracking_wq, (void *)rtl92e_dm_txpower_tracking_wq); +INIT_DELAYED_WORK (&priv->rfpath_check_wq, (void *)rtl92e_dm_rf_pathcheck_wq); +INIT_DELAYED_WORK (&priv->update_beacon_wq, (void *)_rtl92e_update_beacon);INIT_WORK_RSL (&priv->qos_activate, (void *)_rtl92e_qos_activate, dev); -INIT_DELAYED_WORK_RSL (&priv->rtllib->hw_wakeup_wq, - (void *)rtl92e_hw_wakeup_wq, dev); -INIT_DELAYED_WORK_RSL (&priv->rtllib->hw_sleep_wq, - (void *)rtl92e_hw_sleep_wq, dev); +INIT_DELAYED_WORK (&priv->rtllib->hw_wakeup_wq, (void *)rtl92e_hw_wakeup_wq); +INIT_DELAYED_WORK (&priv->rtllib->hw_sleep_wq, (void *)rtl92e_hw_sleep_wq);tasklet_setup (&priv->irq_rx_tasklet, _rtl92e_irq_rx_tasklet);tasklet_setup (&priv->irq_tx_tasklet, _rtl92e_irq_tx_tasklet); tasklet_setup(&priv->irq_prepare_beacon_tasklet,
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +1 -2
@@ -217,8 +217,7 @@ void rtl92e_dm_init(struct net_device *dev)if (IS_HARDWARE_TYPE_8192SE (dev))_rtl92e_dm_init_wa_broadcom_iot (dev); -INIT_DELAYED_WORK_RSL (&priv->gpio_change_rf_wq, - (void *)_rtl92e_dm_check_rf_ctrl_gpio, dev); +INIT_DELAYED_WORK (&priv->gpio_change_rf_wq, (void *)_rtl92e_dm_check_rf_ctrl_gpio); }void rtl92e_dm_deinit (struct net_device *dev)
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -62,8 +62,6 @@#define IW_CUSTOM_MAX 256/* In bytes */ #endif -#define INIT_DELAYED_WORK_RSL (x, y, z) INIT_DELAYED_WORK(x, y) -#define INIT_WORK_RSL (x, y, z) INIT_WORK(x, y)#define container_of_work_rsl (x, y, z) container_of(x, y, z)
drivers/staging/rtl8192e/rtllib_softmac.c +5 -10
@@ -2996,18 +2996,13 @@ int rtllib_softmac_init(struct rtllib_device *ieee)timer_setup (&ieee->beacon_timer, rtllib_send_beacon_cb,0 ); -INIT_DELAYED_WORK_RSL (&ieee->link_change_wq, - (void *)rtllib_link_change_wq, ieee); -INIT_DELAYED_WORK_RSL (&ieee->start_ibss_wq, - (void *)rtllib_start_ibss_wq, ieee); +INIT_DELAYED_WORK (&ieee->link_change_wq, (void *)rtllib_link_change_wq); +INIT_DELAYED_WORK (&ieee->start_ibss_wq, (void *)rtllib_start_ibss_wq);INIT_WORK_RSL (&ieee->associate_complete_wq, (void *)rtllib_associate_complete_wq, ieee); -INIT_DELAYED_WORK_RSL (&ieee->associate_procedure_wq, - (void *)rtllib_associate_procedure_wq, ieee); -INIT_DELAYED_WORK_RSL (&ieee->softmac_scan_wq, - (void *)rtllib_softmac_scan_wq, ieee); -INIT_DELAYED_WORK_RSL (&ieee->associate_retry_wq, - (void *)rtllib_associate_retry_wq, ieee); +INIT_DELAYED_WORK (&ieee->associate_procedure_wq, (void *)rtllib_associate_procedure_wq); +INIT_DELAYED_WORK (&ieee->softmac_scan_wq, (void *)rtllib_softmac_scan_wq); +INIT_DELAYED_WORK (&ieee->associate_retry_wq, (void *)rtllib_associate_retry_wq);INIT_WORK_RSL (&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq, ieee);
Signature · 1 line
2.39.2
PATCH 6/9 staging: rtl8192e: Replace macro INIT_WORK_RSL with standard macro
In reply to Philipp HortmannReplace macro INIT_WORK_RSL with standard macro INIT_WORK to increase readability.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 +++---- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -4
@@ -890,14 +890,13 @@ static void _rtl92e_init_priv_task(struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -INIT_WORK_RSL (&priv->reset_wq, (void *)_rtl92e_restart, dev); -INIT_WORK_RSL (&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq, - dev); +INIT_WORK (&priv->reset_wq, (void *)_rtl92e_restart); +INIT_WORK (&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq);INIT_DELAYED_WORK (&priv->watch_dog_wq, (void *)_rtl92e_watchdog_wq_cb);INIT_DELAYED_WORK (&priv->txpower_tracking_wq, (void *)rtl92e_dm_txpower_tracking_wq);INIT_DELAYED_WORK (&priv->rfpath_check_wq, (void *)rtl92e_dm_rf_pathcheck_wq);INIT_DELAYED_WORK (&priv->update_beacon_wq, (void *)_rtl92e_update_beacon); -INIT_WORK_RSL (&priv->qos_activate, (void *)_rtl92e_qos_activate, dev); +INIT_WORK (&priv->qos_activate, (void *)_rtl92e_qos_activate);INIT_DELAYED_WORK (&priv->rtllib->hw_wakeup_wq, (void *)rtl92e_hw_wakeup_wq);INIT_DELAYED_WORK (&priv->rtllib->hw_sleep_wq, (void *)rtl92e_hw_sleep_wq);tasklet_setup (&priv->irq_rx_tasklet, _rtl92e_irq_rx_tasklet);
drivers/staging/rtl8192e/rtllib.h +0 -2
@@ -62,8 +62,6 @@#define IW_CUSTOM_MAX 256/* In bytes */ #endif -#define INIT_WORK_RSL (x, y, z) INIT_WORK(x, y) -#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)
drivers/staging/rtl8192e/rtllib_softmac.c +2 -4
@@ -2998,13 +2998,11 @@ int rtllib_softmac_init(struct rtllib_device *ieee)INIT_DELAYED_WORK (&ieee->link_change_wq, (void *)rtllib_link_change_wq);INIT_DELAYED_WORK (&ieee->start_ibss_wq, (void *)rtllib_start_ibss_wq); -INIT_WORK_RSL (&ieee->associate_complete_wq, - (void *)rtllib_associate_complete_wq, ieee); +INIT_WORK (&ieee->associate_complete_wq, (void *)rtllib_associate_complete_wq);INIT_DELAYED_WORK (&ieee->associate_procedure_wq, (void *)rtllib_associate_procedure_wq);INIT_DELAYED_WORK (&ieee->softmac_scan_wq, (void *)rtllib_softmac_scan_wq);INIT_DELAYED_WORK (&ieee->associate_retry_wq, (void *)rtllib_associate_retry_wq); -INIT_WORK_RSL (&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq, - ieee); +INIT_WORK (&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq);mutex_init (&ieee->wx_mutex);mutex_init (&ieee->scan_mutex);
Signature · 1 line
2.39.2
PATCH 7/9 staging: rtl8192e: Replace macro container_of_work_rsl with standard f.
In reply to Philipp HortmannReplace macro container_of_work_rsl with standard function container_of to increase readability.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 9 +++------ drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 3 +-- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -6
@@ -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);
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +1 -2
@@ -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);
drivers/staging/rtl8192e/rtllib.h +0 -1
@@ -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)
drivers/staging/rtl8192e/rtllib_softmac.c +1 -1
@@ -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;
drivers/staging/rtl8192e/rtllib_softmac_wx.c +1 -2
@@ -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 ;
Signature · 1 line
2.39.2
PATCH 8/9 staging: rtl8192e: Replace macro iwe_stream_add_event_rsl with standard f.
In reply to Philipp HortmannReplace macro iwe_stream_add_event_rsl with standard function iwe_stream_add_event to increase readability.
--- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_wx.c | 16 ++++++---------- 2 files changed, 6 insertions(+), 13 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -3
@@ -65,9 +65,6 @@#define container_of_dwork_rsl (x, y, z) \ container_of(to_delayed_work(x), y, z) -#define iwe_stream_add_event_rsl (info, start, stop, iwe, len) \ - iwe_stream_add_event(info, start, stop, iwe, len) -#define iwe_stream_add_point_rsl (info, start, stop, iwe, p) \ iwe_stream_add_point(info, start, stop, iwe, p)
drivers/staging/rtl8192e/rtllib_wx.c +6 -10
@@ -41,8 +41,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.cmd =SIOCGIWAP ; iwe.u.ap_addr.sa_family =ARPHRD_ETHER ;ether_addr_copy (iwe.u.ap_addr.sa_data, network->bssid); - start =iwe_stream_add_event_rsl (info, start, stop, - &iwe,IW_EV_ADDR_LEN ); + start =iwe_stream_add_event (info, start, stop, &iwe,IW_EV_ADDR_LEN );/* Remaining entries will be displayed in the order we provide them */ /* Add the ESSID */
@@ -71,8 +70,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, } *pname ='\0' ;snprintf (iwe.u.name,IFNAMSIZ ,"IEEE802.11%s" , proto_name); - start =iwe_stream_add_event_rsl (info, start, stop, - &iwe,IW_EV_CHAR_LEN ); + start =iwe_stream_add_event (info, start, stop, &iwe,IW_EV_CHAR_LEN );/* Add mode */ iwe.cmd =SIOCGIWMODE ; if (network->capability &
@@ -81,8 +79,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.u.mode =IW_MODE_MASTER ; else iwe.u.mode = IW_MODE_ADHOC; - start =iwe_stream_add_event_rsl (info, start, stop, - &iwe,IW_EV_UINT_LEN ); + start =iwe_stream_add_event (info, start, stop, &iwe,IW_EV_UINT_LEN ); }/* Add frequency/channel */
@@ -90,8 +87,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.u.freq.m = network->channel; iwe.u.freq.e =0 ; iwe.u.freq.i =0 ; - start =iwe_stream_add_event_rsl (info, start, stop, &iwe, -IW_EV_FREQ_LEN ); + start =iwe_stream_add_event (info, start, stop, &iwe,IW_EV_FREQ_LEN );/* Add encryption capability */ iwe.cmd =SIOCGIWENCODE ;
@@ -152,7 +148,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.u.bitrate.disabled =0 ; iwe.u.bitrate.fixed =0 ; iwe.u.bitrate.value = max_rate *500000 ; - start =iwe_stream_add_event_rsl (info, start, stop, &iwe,IW_EV_PARAM_LEN ); + start =iwe_stream_add_event (info, start, stop, &iwe,IW_EV_PARAM_LEN ); iwe.cmd =IWEVCUSTOM ; iwe.u.data.length = p - custom;if (iwe.u.data.length)
@@ -172,7 +168,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,if (!(network->stats.mask &RTLLIB_STATMASK_SIGNAL )) iwe.u.qual.updated |=IW_QUAL_QUAL_INVALID ; iwe.u.qual.updated =7 ; - start =iwe_stream_add_event_rsl (info, start, stop, &iwe,IW_EV_QUAL_LEN ); + start =iwe_stream_add_event (info, start, stop, &iwe,IW_EV_QUAL_LEN ); iwe.cmd =IWEVCUSTOM ; p = custom;
Signature · 1 line
2.39.2
PATCH 9/9 staging: rtl8192e: Replace macro iwe_stream_add_point_rsl with standard f.
In reply to Philipp HortmannReplace macro iwe_stream_add_point_rsl with standard function iwe_stream_add_point to increase readability.
--- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_wx.c | 26 ++++++++++---------------- 2 files changed, 10 insertions(+), 19 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -3
@@ -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);
drivers/staging/rtl8192e/rtllib_wx.c +10 -16
@@ -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; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerRe: [PATCH 4/9] staging: rtl8192e: Remove unused macro queue_delayed_work_rsl and queu..
In reply to Philipp HortmannQuoted 3 lines · Philipp Hortmann
Remove unused macro
queue_delayed_work_rslandqueue_work_rsl.Signed-off-by Philipp Hortmann <[email protected]>
Your subject line here looks odd, with the abbreviation. Same for the other commits in this series, please spell the last word out, it's fine to be a little bit longer to make things more obvious what is going on (i.e. I have no idea what "f." is in a subject line...)
thanks,
greg k-h