From: Michal Kazior Date: Fri, 22 Aug 2014 12:33:17 +0000 (+0200) Subject: ath10k: remove ar_pci->started X-Git-Tag: v6.6-pxa1908~22421^2~133^2~55^2~6 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=53b4e07354d4547b7ebb17b6eb63ce2694ad1479;p=linux.git ath10k: remove ar_pci->started There are basically no more uses for ar_pci->started. It is also perfectly safe to call hif_stop without hif_start now. Signed-off-by: Michal Kazior Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index cb4049f8c7b8..3af462ab27f6 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1115,14 +1115,11 @@ static void ath10k_pci_irq_enable(struct ath10k *ar) static int ath10k_pci_hif_start(struct ath10k *ar) { - struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); - ath10k_dbg(ATH10K_DBG_BOOT, "boot hif start\n"); ath10k_pci_irq_enable(ar); ath10k_pci_rx_post(ar); - ar_pci->started = 1; return 0; } @@ -1225,13 +1222,8 @@ static void ath10k_pci_flush(struct ath10k *ar) static void ath10k_pci_hif_stop(struct ath10k *ar) { - struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); - ath10k_dbg(ATH10K_DBG_BOOT, "boot hif stop\n"); - if (WARN_ON(!ar_pci->started)) - return; - ath10k_pci_irq_disable(ar); ath10k_pci_flush(ar); @@ -1240,8 +1232,6 @@ static void ath10k_pci_hif_stop(struct ath10k *ar) * memory is to reset the chip now. */ ath10k_pci_warm_reset(ar); - - ar_pci->started = 0; } static int ath10k_pci_hif_exchange_bmi_msg(struct ath10k *ar, diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h index b9aa692d22f1..d88928cf60ce 100644 --- a/drivers/net/wireless/ath/ath10k/pci.h +++ b/drivers/net/wireless/ath/ath10k/pci.h @@ -167,8 +167,6 @@ struct ath10k_pci { struct tasklet_struct intr_tq; struct tasklet_struct msi_fw_err; - int started; - struct ath10k_pci_pipe pipe_info[CE_COUNT_MAX]; struct ath10k_hif_cb msg_callbacks_current;