From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759894Ab2C2Qti (ORCPT ); Thu, 29 Mar 2012 12:49:38 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:61721 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759753Ab2C2Qr7 (ORCPT ); Thu, 29 Mar 2012 12:47:59 -0400 From: Jiang Liu To: Greg KH , Tony Luck , Fenghua Yu Cc: Jiang Liu , Jes Sorensen , David Howells , Andrew Morton , Suresh Siddha , Ingo Molnar , "Srivatsa S. Bhat" , Lucas De Marchi , linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-altix@sgi.com, Jiang Liu , Keping Chen Subject: [PATCH v2 3/3] IRQ,IA64: normalize return value of chip->irq_set_affinity() method Date: Fri, 30 Mar 2012 00:44:53 +0800 Message-Id: <1333039493-4090-3-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1333039493-4090-1-git-send-email-jiang.liu@huawei.com> References: <1333039493-4090-1-git-send-email-jiang.liu@huawei.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On IA64 platforms, interrupt controller chip's irq_set_affinity() method always copies affinity mask to irq_data->affinity field but still returns 0(IRQ_SET_MASK_OK). That return value causes the interrupt core logic unnecessarily copies the mask to irq_data->affinity field again. So return IRQ_SET_MASK_OK_NOCOPY instead of IRQ_SET_MASK_OK to get rid of the duplicated copy operation. Signed-off-by: Jiang Liu --- arch/ia64/kernel/iosapic.c | 4 +++- arch/ia64/kernel/msi_ia64.c | 4 ++-- arch/ia64/sn/kernel/irq.c | 2 +- arch/ia64/sn/kernel/msi_sn.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index ef4b5d8..47a4d1e 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c @@ -373,8 +373,10 @@ iosapic_set_affinity(struct irq_data *data, const struct cpumask *mask, iosapic_write(iosapic, IOSAPIC_RTE_LOW(rte_index), low32); } + return IRQ_SET_MASK_OK_NOCOPY; +#else + return IRQ_SET_MASK_OK; #endif - return 0; } /* diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c index fb2f1e6..ca66c6a 100644 --- a/arch/ia64/kernel/msi_ia64.c +++ b/arch/ia64/kernel/msi_ia64.c @@ -41,7 +41,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, write_msi_msg(irq, &msg); cpumask_copy(idata->affinity, cpumask_of(cpu)); - return 0; + return IRQ_SET_MASK_OK_NOCOPY; } #endif /* CONFIG_SMP */ @@ -157,7 +157,7 @@ static int dmar_msi_set_affinity(struct irq_data *data, dmar_msi_write(irq, &msg); cpumask_copy(data->affinity, mask); - return 0; + return IRQ_SET_MASK_OK_NOCOPY; } #endif /* CONFIG_SMP */ diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 62cf4dd..aa58931 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c @@ -216,7 +216,7 @@ static int sn_set_affinity_irq(struct irq_data *data, sn_irq_lh[irq], list) (void)sn_retarget_vector(sn_irq_info, nasid, slice); - return 0; + return IRQ_SET_MASK_OK_NOCOPY; } #ifdef CONFIG_SMP diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c index 2b98b9e..ebb5b55 100644 --- a/arch/ia64/sn/kernel/msi_sn.c +++ b/arch/ia64/sn/kernel/msi_sn.c @@ -208,7 +208,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, write_msi_msg(irq, &msg); cpumask_copy(data->affinity, cpu_mask); - return 0; + return IRQ_SET_MASK_OK_NOCOPY; } #endif /* CONFIG_SMP */ -- 1.7.5.4