Commit d9d6a5ae authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by Kalle Valo

ath10k: reduce indentation by moving powersave check within function

For devices that does not support PCI power save, force wake up
API is used. So move powersave check inside force wakeup to reduce
one level indentation.
Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent aa538aca
...@@ -487,6 +487,9 @@ static int ath10k_pci_force_wake(struct ath10k *ar) ...@@ -487,6 +487,9 @@ static int ath10k_pci_force_wake(struct ath10k *ar)
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
if (ar_pci->pci_ps)
return ret;
spin_lock_irqsave(&ar_pci->ps_lock, flags); spin_lock_irqsave(&ar_pci->ps_lock, flags);
if (!ar_pci->ps_awake) { if (!ar_pci->ps_awake) {
...@@ -2480,12 +2483,10 @@ static int ath10k_pci_hif_resume(struct ath10k *ar) ...@@ -2480,12 +2483,10 @@ static int ath10k_pci_hif_resume(struct ath10k *ar)
u32 val; u32 val;
int ret = 0; int ret = 0;
if (ar_pci->pci_ps == 0) { ret = ath10k_pci_force_wake(ar);
ret = ath10k_pci_force_wake(ar); if (ret) {
if (ret) { ath10k_err(ar, "failed to wake up target: %d\n", ret);
ath10k_err(ar, "failed to wake up target: %d\n", ret); return ret;
return ret;
}
} }
/* Suspend/Resume resets the PCI configuration space, so we have to /* Suspend/Resume resets the PCI configuration space, so we have to
...@@ -2592,13 +2593,10 @@ static irqreturn_t ath10k_pci_interrupt_handler(int irq, void *arg) ...@@ -2592,13 +2593,10 @@ static irqreturn_t ath10k_pci_interrupt_handler(int irq, void *arg)
struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
int ret; int ret;
if (ar_pci->pci_ps == 0) { ret = ath10k_pci_force_wake(ar);
ret = ath10k_pci_force_wake(ar); if (ret) {
if (ret) { ath10k_warn(ar, "failed to wake device up on irq: %d\n", ret);
ath10k_warn(ar, "failed to wake device up on irq: %d\n", return IRQ_NONE;
ret);
return IRQ_NONE;
}
} }
if (ar_pci->num_msi_intrs == 0) { if (ar_pci->num_msi_intrs == 0) {
...@@ -3071,12 +3069,10 @@ static int ath10k_pci_probe(struct pci_dev *pdev, ...@@ -3071,12 +3069,10 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
goto err_sleep; goto err_sleep;
} }
if (ar_pci->pci_ps == 0) { ret = ath10k_pci_force_wake(ar);
ret = ath10k_pci_force_wake(ar); if (ret) {
if (ret) { ath10k_warn(ar, "failed to wake up device : %d\n", ret);
ath10k_warn(ar, "failed to wake up device : %d\n", ret); goto err_free_pipes;
goto err_free_pipes;
}
} }
ath10k_pci_ce_deinit(ar); ath10k_pci_ce_deinit(ar);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment