@@ -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;
@@ -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);
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(-)