From: Henrik Austad <henrik@austad.us>
To: linux-rt-users@vger.kernel.org
Cc: linux-wireless@vger.kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 06/10] iwlwifi: pcie: determine the interrupt type in the handler
Date: Thu, 19 Dec 2013 00:26:01 +0100 [thread overview]
Message-ID: <1387409165-28319-7-git-send-email-henrik@austad.us> (raw)
In-Reply-To: <1387409165-28319-1-git-send-email-henrik@austad.us>
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Instead of having:
iwl_pcie_irq_handler
iwl_pcie_isr_ict
iwl_pcie_isr_non_ict
we now have:
iwl_pcie_irq_handler:
if (use_ict))
iwl_pcie_int_cause_ict;
else
iwl_pcie_int_cause_non_ict;
This is much clearer.
Change-Id: Ieb99e8120c62749c06e3b2636aaf7ccbea8c72c5
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/pcie/rx.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index cd96eb2..aea6202 100644
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -810,8 +810,7 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)
local_bh_enable();
}
-/* legacy (non-ICT) ISR. Assumes that trans_pcie->irq_lock is held */
-static irqreturn_t iwl_pcie_isr_non_ict(struct iwl_trans *trans)
+static irqreturn_t iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
u32 inta;
@@ -884,7 +883,7 @@ none:
* the interrupt we need to service, driver will set the entries back to 0 and
* set index.
*/
-static irqreturn_t iwl_pcie_isr_ict(struct iwl_trans *trans)
+static irqreturn_t iwl_pcie_int_cause_ict(struct iwl_trans *trans)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
irqreturn_t ret;
@@ -892,14 +891,6 @@ static irqreturn_t iwl_pcie_isr_ict(struct iwl_trans *trans)
u32 val = 0;
u32 read;
- /* dram interrupt table not set yet,
- * use legacy interrupt.
- */
- if (unlikely(!trans_pcie->use_ict)) {
- ret = iwl_pcie_isr_non_ict(trans);
- return ret;
- }
-
trace_iwlwifi_dev_irq(trans->dev);
/* Ignore interrupt if there's nothing in NIC to service.
@@ -985,7 +976,14 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
spin_lock_irqsave(&trans_pcie->irq_lock, flags);
- ret = iwl_pcie_isr_ict(trans);
+ /* dram interrupt table not set yet,
+ * use legacy interrupt.
+ */
+ if (likely(trans_pcie->use_ict))
+ ret = iwl_pcie_int_cause_ict(trans);
+ else
+ ret = iwl_pcie_int_cause_non_ict(trans);
+
if (ret != IRQ_WAKE_THREAD) {
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
return ret;
--
1.7.10.4
next prev parent reply other threads:[~2013-12-18 23:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-18 23:25 [PATCH 00/10] update of make iwlwifi RT friendly Henrik Austad
2013-12-18 23:25 ` [PATCH 01/10] iwlwifi: pcie: clean up ICT allocation code Henrik Austad
2013-12-18 23:25 ` [PATCH 02/10] iwlwifi: pcie: track interrupt mask in SW Henrik Austad
2013-12-18 23:25 ` [PATCH 03/10] iwlwifi: pcie: re-organize the PCIe ISR code Henrik Austad
2013-12-18 23:25 ` [PATCH 04/10] iwlwifi: pcie: move the ICT / non-ICT handling functions Henrik Austad
2013-12-18 23:26 ` [PATCH 05/10] iwlwifi: pcie: read the interrupt cause from the handler Henrik Austad
2013-12-18 23:26 ` Henrik Austad [this message]
2013-12-18 23:26 ` [PATCH 07/10] iwlwifi: pcie: return inta from iwl_pcie_int_cause_{non_}ict Henrik Austad
2013-12-18 23:26 ` [PATCH 08/10] iwlwifi: pcie: no need to save inta in trans_pcie Henrik Austad
2013-12-18 23:26 ` [PATCH 09/10] iwlwifi: pcie: move interrupt prints to the common handler Henrik Austad
2013-12-18 23:26 ` [PATCH 10/10] iwlwifi: pcie: stop using _irqsave Henrik Austad
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387409165-28319-7-git-send-email-henrik@austad.us \
--to=henrik@austad.us \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).