From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753184AbcHBJMW (ORCPT ); Tue, 2 Aug 2016 05:12:22 -0400 Received: from smtpoutz298.laposte.net ([178.22.154.198]:42248 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751808AbcHBJL7 (ORCPT ); Tue, 2 Aug 2016 05:11:59 -0400 To: Grant Likely , Thomas Gambier , Marc Zyngier , Jason Cooper Cc: LKML , Mason From: Sebastian Frias Subject: [PATCH 2/2] irqdomain: factorise irq_domain_xlate_onetwocell() Message-ID: <57A063BB.7000708@laposte.net> Date: Tue, 2 Aug 2016 11:11:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-VR-SrcIP: 78.31.43.6 X-VR-FullState: 0 X-VR-Score: -100 X-VR-Cause-1: gggruggvucftvghtrhhoucdtuddrfeeltddrjeejgddtjecutefuodetggdotefrodftvfcurfhrohhf X-VR-Cause-2: ihhlvgemucfntefrqffuvffgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhs X-VR-Cause-3: ucdlqddutddtmdenucfjughrpefvhffukffffgggtgfgsehtjegrtddtfeejnecuhfhrohhmpefuvggs X-VR-Cause-4: rghsthhirghnucfhrhhirghsuceoshhfkeegsehlrghpohhsthgvrdhnvghtqeenucfkphepjeekrdef X-VR-Cause-5: uddrgeefrdeinecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghloheplgdujedvrddvjedr X-VR-Cause-6: tddrvddugegnpdhinhgvthepjeekrdefuddrgeefrdeipdhmrghilhhfrhhomhepshhfkeegsehlrghp X-VR-Cause-7: ohhsthgvrdhnvghtpdhrtghpthhtohepghhrrghnthdrlhhikhgvlhihsehsvggtrhgvthhlrggsrdgt X-VR-Cause-8: rg X-VR-AvState: No X-VR-State: 0 X-VR-State: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 16b2e6e2f31d ("irq_domain: Create common xlate functions that device drivers can use") introduced three similar functions: irq_domain_xlate_onecell() irq_domain_xlate_twocell() irq_domain_xlate_onetwocell() yet the last one, irq_domain_xlate_onetwocell(), can be factored to use the two previous ones to avoid code duplication. Signed-off-by: Sebastian Frias --- kernel/irq/irqdomain.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 1bdd3fe..28c09ab 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -821,14 +821,12 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d, const u32 *intspec, unsigned int intsize, unsigned long *out_hwirq, unsigned int *out_type) { - if (WARN_ON(intsize < 1)) - return -EINVAL; - *out_hwirq = intspec[0]; if (intsize > 1) - *out_type = intspec[1] & IRQ_TYPE_SENSE_MASK; + return irq_domain_xlate_twocell(d, ctrlr, intspec, intsize, + out_hwirq, out_type); else - *out_type = IRQ_TYPE_NONE; - return 0; + return irq_domain_xlate_onecell(d, ctrlr, intspec, intsize, + out_hwirq, out_type); } EXPORT_SYMBOL_GPL(irq_domain_xlate_onetwocell); -- 1.7.11.2