From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752558AbcHAO11 (ORCPT ); Mon, 1 Aug 2016 10:27:27 -0400 Received: from smtpoutz300.laposte.net ([178.22.154.200]:38784 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751640AbcHAO1V (ORCPT ); Mon, 1 Aug 2016 10:27:21 -0400 To: Grant Likely , Marc Zyngier , Thomas Gleixner , Jason Cooper Cc: LKML , Mason From: Sebastian Frias Subject: [PATCH] irqdomain: factorise irq_domain_xlate_onetwocell() Message-ID: <579F5C3B.5030805@laposte.net> Date: Mon, 1 Aug 2016 16:27:07 +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: gggruggvucftvghtrhhoucdtuddrfeeltddrjeehgdejgecutefuodetggdotefrodftvfcurfhrohhf 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 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. Fixes: 16b2e6e2f31d ("irq_domain: Create common xlate functions that device drivers can use") Signed-off-by: Sebastian Frias --- NOTE: the factored code is not strictly the same in the sense that 16b2e6e2f31d returns "intspec[1]" as 'out_type', while this patch would make it return "intspec[1] & IRQ_TYPE_SENSE_MASK". Feel free to comment on that matter. --- kernel/irq/irqdomain.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index bee8b02..ea2df0e 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -839,9 +839,20 @@ int irq_domain_xlate_onetwocell(struct irq_domain *d, { if (WARN_ON(intsize < 1)) return -EINVAL; - *out_hwirq = intspec[0]; - *out_type = (intsize > 1) ? intspec[1] : IRQ_TYPE_NONE; - return 0; + if (intsize == 1) + return irq_domain_xlate_onecell(d, + ctrlr, + intspec, + intsize, + out_hwirq, + out_type); + else + return irq_domain_xlate_twocell(d, + ctrlr, + intspec, + intsize, + out_hwirq, + out_type); } EXPORT_SYMBOL_GPL(irq_domain_xlate_onetwocell); -- 1.7.11.2