[PATCH/RFT 09/12] ath10k: propagate ath10k_ce_disable_interrupts() errors
Kalle Valo
kvalo at qca.qualcomm.com
Wed Nov 6 07:34:24 EST 2013
Michal Kazior <michal.kazior at tieto.com> writes:
> This shouldn't be silenced. This will be necessary
> for PCI init code reordering.
>
> Signed-off-by: Michal Kazior <michal.kazior at tieto.com>
[...]
> -void ath10k_ce_disable_interrupts(struct ath10k *ar)
> +int ath10k_ce_disable_interrupts(struct ath10k *ar)
> {
> int ce_id, ret;
>
> ret = ath10k_pci_wake(ar);
> if (ret)
> - return;
> + return ret;
>
> for (ce_id = 0; ce_id < CE_COUNT; ce_id++) {
> u32 ctrl_addr = ath10k_ce_base_address(ce_id);
> @@ -807,7 +807,9 @@ void ath10k_ce_disable_interrupts(struct ath10k *ar)
> ath10k_ce_error_intr_disable(ar, ctrl_addr);
> ath10k_ce_watermark_intr_disable(ar, ctrl_addr);
> }
> +
> ath10k_pci_sleep(ar);
> + return ret;
Empty line before the return. And I think 'return 0' is more clear here.
> --- a/drivers/net/wireless/ath/ath10k/pci.c
> +++ b/drivers/net/wireless/ath/ath10k/pci.c
> @@ -879,8 +879,12 @@ static void ath10k_pci_stop_ce(struct ath10k *ar)
> struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
> struct ath10k_pci_compl *compl;
> struct sk_buff *skb;
> + int ret;
> +
> + ret = ath10k_ce_disable_interrupts(ar);
> + if (ret)
> + ath10k_warn("failed to disable CE interrupts (%d)\n", ret);
"failed to disable CE interrupts: %d\n"
--
Kalle Valo
More information about the ath10k
mailing list