diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2013-11-08 02:01:26 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2013-11-12 13:06:45 -0500 |
commit | d7fb47f52ef5538b4eb32856bd8cb580623dd87f (patch) | |
tree | 42d60fbfe2396a32045b8970783b429337d61db3 /drivers/net/wireless/ath/ath10k/pci.c | |
parent | 96a9d0dc296b9ee63383549efb683dbf0ae2f0f8 (diff) |
ath10k: rename ath10k_pci_reset_target()
What the function does is to actually wait for the
firmware indication bit to be set. Prerequisite
for this is having interrupts registered.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.c')
-rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index a001ff250d3a..4aa7992f1a35 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c | |||
@@ -53,7 +53,7 @@ static int ath10k_pci_post_rx_pipe(struct ath10k_pci_pipe *pipe_info, | |||
53 | static void ath10k_pci_rx_pipe_cleanup(struct ath10k_pci_pipe *pipe_info); | 53 | static void ath10k_pci_rx_pipe_cleanup(struct ath10k_pci_pipe *pipe_info); |
54 | static void ath10k_pci_stop_ce(struct ath10k *ar); | 54 | static void ath10k_pci_stop_ce(struct ath10k *ar); |
55 | static void ath10k_pci_device_reset(struct ath10k *ar); | 55 | static void ath10k_pci_device_reset(struct ath10k *ar); |
56 | static int ath10k_pci_reset_target(struct ath10k *ar); | 56 | static int ath10k_pci_wait_for_target_init(struct ath10k *ar); |
57 | static int ath10k_pci_start_intr(struct ath10k *ar); | 57 | static int ath10k_pci_start_intr(struct ath10k *ar); |
58 | static void ath10k_pci_stop_intr(struct ath10k *ar); | 58 | static void ath10k_pci_stop_intr(struct ath10k *ar); |
59 | 59 | ||
@@ -1857,7 +1857,7 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar) | |||
1857 | */ | 1857 | */ |
1858 | ath10k_pci_device_reset(ar); | 1858 | ath10k_pci_device_reset(ar); |
1859 | 1859 | ||
1860 | ret = ath10k_pci_reset_target(ar); | 1860 | ret = ath10k_pci_wait_for_target_init(ar); |
1861 | if (ret) | 1861 | if (ret) |
1862 | goto err_irq; | 1862 | goto err_irq; |
1863 | 1863 | ||
@@ -2257,7 +2257,7 @@ static void ath10k_pci_stop_intr(struct ath10k *ar) | |||
2257 | pci_disable_msi(ar_pci->pdev); | 2257 | pci_disable_msi(ar_pci->pdev); |
2258 | } | 2258 | } |
2259 | 2259 | ||
2260 | static int ath10k_pci_reset_target(struct ath10k *ar) | 2260 | static int ath10k_pci_wait_for_target_init(struct ath10k *ar) |
2261 | { | 2261 | { |
2262 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); | 2262 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); |
2263 | int wait_limit = 300; /* 3 sec */ | 2263 | int wait_limit = 300; /* 3 sec */ |