From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752064AbdJZUOi (ORCPT ); Thu, 26 Oct 2017 16:14:38 -0400 Received: from mout.web.de ([212.227.17.12]:53893 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbdJZUOg (ORCPT ); Thu, 26 Oct 2017 16:14:36 -0400 To: kernel-janitors@vger.kernel.org, Daniel Drake , Haojian Zhuang , Jason Cooper , Marc Zyngier , Thomas Gleixner Cc: LKML From: SF Markus Elfring Subject: [PATCH] irqchip: mmp: Use common error handling code in mmp2_mux_of_init() Message-ID: <690b6f85-80a7-4add-2106-a3df2c614cd5@users.sourceforge.net> Date: Thu, 26 Oct 2017 22:14:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:yNxZUQk/4frLPGy+kkIYBxJaawqYpxsBzsTG87lVW17sUN1NZJ7 VFJ4q5wmWfvRETg5eO0Osd4wgNeQLoBVL017WZugyUCxdISutTsiJqhkvxkPccQQ9Gbos1s IImo6W7b+kGv1rIV1rpDY70OW6qUMhaRhMch2uK/OCKiTSbKEpgw1pc0VadefuImC7nu5b6 suRtiNsA4lzg5jAeNnuuw== X-UI-Out-Filterresults: notjunk:1;V01:K0:5WnYHMvVqOE=:4bLLLzLGrnn5W4+YZpx9Da 8td3ogpkXTDRSTc1D56KD5cqBk7x679Lv1OuYbz83sJbQi8CPSTaz0n7dGpXiflGCC19X8Zg5 PflVIP12DmlcNy1esTF6q9wLFqi2DWFb8QRMIGTxFoDUxfpBNNTPCKMg4r03oGoybHMlk/vHF IK3CryiE8VnCz+z25iheKiPUl8LcV0NI9jM8v8pgonO7nvEvE0raW2l8GbbROeGZY5fMpmv7J khACAPTaIajzH+ZY+cPzBzP8Vh1qYr4ws3EdWEQF4FmAdEGxqVfo4sAt/heJzD1LW++Kn72cJ KJBhQzfj4E6iwoQSNqAPvzdMr+Gi7HExnpqdJHnhMcweA1SCuHAMACsQIDQookxPRncvFmCmw p/BifZCOa7KWPjxes59ghGdByvkOpZZWzXuegYmagFnxqUgcO+DDlDPmWpFkJn8AgG+ch35uy Go8vqny1g3CAO1bVadfUejBi4ZihusoFyZNa0J3a31+f9LaB9Rrp899KS8i6nXCGig6lMBQ94 htmCLHCy4FEpqlCsVoo5rTtycA++/VM5gGBGy3f0ry4KnTQRKTh357PbPoKOD/2VI6tnlFHUR fV4Kt8hbiTjpwuFFoCcR21stjBZ83gn7gG+OcK8h2N6qB2R2EyyQ7Iy8oPqzEusew2nAfFcLd NgTrZfJosgSQLUKj5FNjSN2b7VzQSoRPy1F1hwFD6Q/uEJuJgyhDjV5R0YYIjGmLBUKtpaNNE qzJjaHkQAsrXzfrEfTQAM38JgNQQkd4SPi1xPwFLJVYcBxno9z0picEOJIpi6wzGz0WPZ3Qap 1XPc7tHj/L1b3iCjh3P4Ml2mPPoCIU19mKs+g8gRpokXqfURpY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 26 Oct 2017 22:05:26 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/irqchip/irq-mmp.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index 25f32e1d7764..4a3dd020777f 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c @@ -438,16 +438,14 @@ static int __init mmp2_mux_of_init(struct device_node *node, return -EINVAL; } ret = of_address_to_resource(node, 0, &res); - if (ret < 0) { - pr_err("Not found reg property\n"); - return -EINVAL; - } + if (ret < 0) + goto report_failure; + icu_data[i].reg_status = mmp_icu_base + res.start; ret = of_address_to_resource(node, 1, &res); - if (ret < 0) { - pr_err("Not found reg property\n"); - return -EINVAL; - } + if (ret < 0) + goto report_failure; + icu_data[i].reg_mask = mmp_icu_base + res.start; icu_data[i].cascade_irq = irq_of_parse_and_map(node, 0); if (!icu_data[i].cascade_irq) @@ -483,6 +481,10 @@ static int __init mmp2_mux_of_init(struct device_node *node, } irq_domain_remove(icu_data[i].domain); return -EINVAL; + +report_failure: + pr_err("Not found reg property\n"); + return -EINVAL; } IRQCHIP_DECLARE(mmp2_mux_intc, "mrvl,mmp2-mux-intc", mmp2_mux_of_init); #endif -- 2.14.3