linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, Yijing Wang <wangyijing@huawei.com>,
	"Tony Luck" <tony.luck@intel.com>, <linux-ia64@vger.kernel.org>
Subject: [PATCH v3 4/9] MSI: Use __get_cached_msi_msg() instead of get_cached_msi_msg()
Date: Tue, 23 Sep 2014 13:27:25 +0800	[thread overview]
Message-ID: <1411450050-1510-5-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1411450050-1510-1-git-send-email-wangyijing@huawei.com>

Get_cached_msi_msg() only be called in two places,
ia64_set_msi_irq_affinity() and sn_set_msi_irq_affinity().

The code flow is:
irq = irq_data->irq
    get_cached_msi_msg(irq)
	    irq_get_msi_desc(irq)
		    irq_get_irq_data(irq)
			    msi_desc = irq_data->desc
        __get_cached_msi_msg(msi_desc, msg)

This is crazy, we should use __get_cached_msi_msg(irq_data->desc, msg)
directly to simplify the flow.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
CC: Tony Luck <tony.luck@intel.com>
CC: linux-ia64@vger.kernel.org
---
 arch/ia64/kernel/msi_ia64.c  |    2 +-
 arch/ia64/sn/kernel/msi_sn.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index c430f91..8c3730c 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -23,7 +23,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,
 	if (irq_prepare_move(irq, cpu))
 		return -1;
 
-	get_cached_msi_msg(irq, &msg);
+	__get_cached_msi_msg(idata->msi_desc, &msg);
 
 	addr = msg.address_lo;
 	addr &= MSI_ADDR_DEST_ID_MASK;
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index afc58d2..446e779 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -175,8 +175,8 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,
 	 * Release XIO resources for the old MSI PCI address
 	 */
 
-	get_cached_msi_msg(irq, &msg);
-        sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;
+	__get_cached_msi_msg(data->msi_desc, &msg);
+	sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo;
 	pdev = sn_pdev->pdi_linux_pcidev;
 	provider = SN_PCIDEV_BUSPROVIDER(pdev);
 
-- 
1.7.1


  parent reply	other threads:[~2014-09-23  5:03 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-23  5:27 [PATCH v3 0/9] Some cleanup for MSI code Yijing Wang
2014-09-23  5:27 ` [PATCH v3 1/9] PCI/MSI: Clean up the kobject in struct msi_desc Yijing Wang
2014-09-23  5:27 ` [PATCH v3 2/9] PCI/MSI: Remove msi_attrib->pos " Yijing Wang
2014-09-23  5:27 ` [PATCH v3 3/9] PCI/MSI: Change msi_bus attribute to support enable/disable MSI for EP Yijing Wang
2014-09-23 17:54   ` Bjorn Helgaas
2014-09-24  3:50     ` Yijing Wang
2014-09-23  5:27 ` Yijing Wang [this message]
2014-09-23  5:27 ` [PATCH v3 5/9] PCI/MSI: Remove unused function get_cached_msi_msg() Yijing Wang
2014-09-23  5:27 ` [PATCH v3 6/9] PCI/MSI: Rename __get_cached_msi_msg() to get_cached_msi_msg() Yijing Wang
2014-09-23  5:27 ` [PATCH v3 7/9] MSI/powerpc: Use __read_msi_msg() instead of read_msi_msg() Yijing Wang
2014-09-23  5:27 ` [PATCH v3 8/9] PCI/MSI: Remove unused function read_msi_msg() Yijing Wang
2014-09-23  5:27 ` [PATCH v3 9/9] PCI/MSI: Rename __read_msi_msg() to read_msi_msg() Yijing Wang
2014-09-23 18:12 ` [PATCH v3 0/9] Some cleanup for MSI code Bjorn Helgaas

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=1411450050-1510-5-git-send-email-wangyijing@huawei.com \
    --to=wangyijing@huawei.com \
    --cc=bhelgaas@google.com \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=tony.luck@intel.com \
    /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).