Commit 9c9c9f8e authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Replace macro INIT_DELAYED_WORK_RSL with standard macro 



Replace macro INIT_DELAYED_WORK_RSL with standard macro INIT_DELAYED_WORK
to increase readability.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/61b589012a5efb4b68a76e52eb84ad19093013b3.1679504314.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3443454f

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+6 −12
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);