Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac76764 authored by Kees Cook's avatar Kees Cook Committed by Kalle Valo
Browse files

ath: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 698dbbf8

drivers/net/wireless/ath/ar5523/ar5523.c

+3 −4
Original line number Diff line number Diff line
@@ -889,9 +889,9 @@ static void ar5523_tx_work(struct work_struct *work) 
	mutex_unlock(&ar->mutex);

}



static void ar5523_tx_wd_timer(unsigned long arg)

static void ar5523_tx_wd_timer(struct timer_list *t)

{

	struct ar5523 *ar = (struct ar5523 *) arg;

	struct ar5523 *ar = from_timer(ar, t, tx_wd_timer);



	ar5523_dbg(ar, "TX watchdog timer triggered\n");

	ieee80211_queue_work(ar->hw, &ar->tx_wd_work);
@@ -1599,8 +1599,7 @@ static int ar5523_probe(struct usb_interface *intf, 
	mutex_init(&ar->mutex);



	INIT_DELAYED_WORK(&ar->stat_work, ar5523_stat_work);

	init_timer(&ar->tx_wd_timer);

	setup_timer(&ar->tx_wd_timer, ar5523_tx_wd_timer, (unsigned long) ar);

	timer_setup(&ar->tx_wd_timer, ar5523_tx_wd_timer, 0);

	INIT_WORK(&ar->tx_wd_work, ar5523_tx_wd_work);

	INIT_WORK(&ar->tx_work, ar5523_tx_work);

	INIT_LIST_HEAD(&ar->tx_queue_pending);

drivers/net/wireless/ath/ath10k/htt_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -200,9 +200,9 @@ static void ath10k_htt_rx_msdu_buff_replenish(struct ath10k_htt *htt) 
	spin_unlock_bh(&htt->rx_ring.lock);

}



static void ath10k_htt_rx_ring_refill_retry(unsigned long arg)

static void ath10k_htt_rx_ring_refill_retry(struct timer_list *t)

{

	struct ath10k_htt *htt = (struct ath10k_htt *)arg;

	struct ath10k_htt *htt = from_timer(htt, t, rx_ring.refill_retry_timer);



	ath10k_htt_rx_msdu_buff_replenish(htt);

}
@@ -507,7 +507,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt) 
	*htt->rx_ring.alloc_idx.vaddr = 0;



	/* Initialize the Rx refill retry timer */

	setup_timer(timer, ath10k_htt_rx_ring_refill_retry, (unsigned long)htt);

	timer_setup(timer, ath10k_htt_rx_ring_refill_retry, 0);



	spin_lock_init(&htt->rx_ring.lock);

drivers/net/wireless/ath/ath10k/pci.c

+8 −9
Original line number Diff line number Diff line
@@ -585,10 +585,10 @@ static void ath10k_pci_sleep(struct ath10k *ar) 
	spin_unlock_irqrestore(&ar_pci->ps_lock, flags);

}



static void ath10k_pci_ps_timer(unsigned long ptr)

static void ath10k_pci_ps_timer(struct timer_list *t)

{

	struct ath10k *ar = (void *)ptr;

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	struct ath10k_pci *ar_pci = from_timer(ar_pci, t, ps_timer);

	struct ath10k *ar = ar_pci->ar;

	unsigned long flags;



	spin_lock_irqsave(&ar_pci->ps_lock, flags);
@@ -838,9 +838,10 @@ void ath10k_pci_rx_post(struct ath10k *ar) 
		ath10k_pci_rx_post_pipe(&ar_pci->pipe_info[i]);

}



void ath10k_pci_rx_replenish_retry(unsigned long ptr)

void ath10k_pci_rx_replenish_retry(struct timer_list *t)

{

	struct ath10k *ar = (void *)ptr;

	struct ath10k_pci *ar_pci = from_timer(ar_pci, t, rx_post_retry);

	struct ath10k *ar = ar_pci->ar;



	ath10k_pci_rx_post(ar);

}
@@ -3164,8 +3165,7 @@ int ath10k_pci_setup_resource(struct ath10k *ar) 
	spin_lock_init(&ce->ce_lock);

	spin_lock_init(&ar_pci->ps_lock);



	setup_timer(&ar_pci->rx_post_retry, ath10k_pci_rx_replenish_retry,

		    (unsigned long)ar);

	timer_setup(&ar_pci->rx_post_retry, ath10k_pci_rx_replenish_retry, 0);



	if (QCA_REV_6174(ar) || QCA_REV_9377(ar))

		ath10k_pci_override_ce_config(ar);
@@ -3291,8 +3291,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
	ar->id.subsystem_vendor = pdev->subsystem_vendor;

	ar->id.subsystem_device = pdev->subsystem_device;



	setup_timer(&ar_pci->ps_timer, ath10k_pci_ps_timer,

		    (unsigned long)ar);

	timer_setup(&ar_pci->ps_timer, ath10k_pci_ps_timer, 0);



	ret = ath10k_pci_setup_resource(ar);

	if (ret) {

drivers/net/wireless/ath/ath10k/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ void ath10k_pci_hif_power_down(struct ath10k *ar); 
int ath10k_pci_alloc_pipes(struct ath10k *ar);

void ath10k_pci_free_pipes(struct ath10k *ar);

void ath10k_pci_free_pipes(struct ath10k *ar);

void ath10k_pci_rx_replenish_retry(unsigned long ptr);

void ath10k_pci_rx_replenish_retry(struct timer_list *t);

void ath10k_pci_ce_deinit(struct ath10k *ar);

void ath10k_pci_init_napi(struct ath10k *ar);

int ath10k_pci_init_pipes(struct ath10k *ar);

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −4
Original line number Diff line number Diff line
@@ -3589,10 +3589,8 @@ static int ath6kl_cfg80211_vif_init(struct ath6kl_vif *vif) 
		return -ENOMEM;

	}



	setup_timer(&vif->disconnect_timer, disconnect_timer_handler,

		    (unsigned long) vif->ndev);

	setup_timer(&vif->sched_scan_timer, ath6kl_wmi_sscan_timer,

		    (unsigned long) vif);

	timer_setup(&vif->disconnect_timer, disconnect_timer_handler, 0);

	timer_setup(&vif->sched_scan_timer, ath6kl_wmi_sscan_timer, 0);



	set_bit(WMM_ENABLED, &vif->flags);

	spin_lock_init(&vif->if_lock);