Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751935AbbGKVkR (ORCPT ); Sat, 11 Jul 2015 17:40:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37505 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbbGKVkP (ORCPT ); Sat, 11 Jul 2015 17:40:15 -0400 Date: Sat, 11 Jul 2015 14:34:30 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: konrad.wilk@oracle.com, yinghai@kernel.org, mingo@kernel.org, bhelgaas@google.com, tglx@linutronix.de, jiang.liu@linux.intel.com, hpa@zytor.com, rdunlap@infradead.org, tony.luck@intel.com, benh@kernel.crashing.org, bp@alien8.de, linux-kernel@vger.kernel.org Reply-To: bhelgaas@google.com, tglx@linutronix.de, jiang.liu@linux.intel.com, konrad.wilk@oracle.com, yinghai@kernel.org, mingo@kernel.org, benh@kernel.crashing.org, bp@alien8.de, linux-kernel@vger.kernel.org, hpa@zytor.com, rdunlap@infradead.org, tony.luck@intel.com In-Reply-To: <1433391238-19471-21-git-send-email-jiang.liu@linux.intel.com> References: <1433391238-19471-21-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: Remove the irq argument from setup_affinity() Git-Commit-ID: a8a98eac7b238beb49b479c164303651d5a37eb6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3069 Lines: 85 Commit-ID: a8a98eac7b238beb49b479c164303651d5a37eb6 Gitweb: http://git.kernel.org/tip/a8a98eac7b238beb49b479c164303651d5a37eb6 Author: Jiang Liu AuthorDate: Thu, 4 Jun 2015 12:13:30 +0800 Committer: Thomas Gleixner CommitDate: Sat, 11 Jul 2015 23:14:25 +0200 genirq: Remove the irq argument from setup_affinity() Unused except for the alpha wrapper, which can retrieve if from the irq descriptor. Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Link: http://lkml.kernel.org/r/1433391238-19471-21-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- kernel/irq/manage.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index f5b7742..886f115 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -361,8 +361,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier); /* * Generic version of the affinity autoselector. */ -static int -setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) +static int setup_affinity(struct irq_desc *desc, struct cpumask *mask) { struct cpumask *set = irq_default_affinity; int node = irq_desc_get_node(desc); @@ -395,10 +394,10 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) return 0; } #else -static inline int -setup_affinity(unsigned int irq, struct irq_desc *d, struct cpumask *mask) +/* Wrapper for ALPHA specific affinity selector magic */ +static inline int setup_affinity(struct irq_desc *d, struct cpumask *mask) { - return irq_select_affinity(irq); + return irq_select_affinity(irq_desc_get_irq(d)); } #endif @@ -412,14 +411,14 @@ int irq_select_affinity_usr(unsigned int irq, struct cpumask *mask) int ret; raw_spin_lock_irqsave(&desc->lock, flags); - ret = setup_affinity(irq, desc, mask); + ret = setup_affinity(desc, mask); raw_spin_unlock_irqrestore(&desc->lock, flags); return ret; } #else static inline int -setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) +setup_affinity(struct irq_desc *desc, struct cpumask *mask) { return 0; } @@ -1256,7 +1255,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) } /* Set default affinity mask once everything is setup */ - setup_affinity(irq, desc, mask); + setup_affinity(desc, mask); } else if (new->flags & IRQF_TRIGGER_MASK) { unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/