From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753962AbcHAO6w (ORCPT ); Mon, 1 Aug 2016 10:58:52 -0400 Received: from smtpoutz25.laposte.net ([194.117.213.100]:47772 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752250AbcHAO6g (ORCPT ); Mon, 1 Aug 2016 10:58:36 -0400 Subject: [PATCH v2] irqdomain: factorise irq_domain_xlate_onetwocell() To: Grant Likely , Marc Zyngier , Thomas Gleixner , Jason Cooper References: <579F5C3B.5030805@laposte.net> Cc: LKML , Mason From: Sebastian Frias Message-ID: <579F635E.6090505@laposte.net> Date: Mon, 1 Aug 2016 16:57:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <579F5C3B.5030805@laposte.net> 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: gggruggvucftvghtrhhoucdtuddrfeeltddrjeehgdektdcutefuodetggdotefrodftvfcurfhrohhf X-VR-Cause-2: ihhlvgemucfntefrqffuvffgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhs X-VR-Cause-3: ucdlqddutddtmdenucfjughrpefuvfhfhffkffgfgggjtgfgsehtjegrtddtfeejnecuhfhrohhmpefu X-VR-Cause-4: vggsrghsthhirghnucfhrhhirghsuceoshhfkeegsehlrghpohhsthgvrdhnvghtqeenucfkphepjeek X-VR-Cause-5: rdefuddrgeefrdeinecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghloheplgdujedvrddv X-VR-Cause-6: jedrtddrvddugegnpdhinhgvthepjeekrdefuddrgeefrdeipdhmrghilhhfrhhomhepshhfkeegsehl X-VR-Cause-7: rghpohhsthgvrdhnvghtpdhrtghpthhtohepghhrrghnthdrlhhikhgvlhihsehsvggtrhgvthhlrggs X-VR-Cause-8: rdgtrg 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. 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index bee8b02..125a28c 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -839,9 +839,12 @@ 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