From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751864AbbFXKc6 (ORCPT ); Wed, 24 Jun 2015 06:32:58 -0400 Received: from mout.web.de ([212.227.15.14]:53370 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbbFXKcs (ORCPT ); Wed, 24 Jun 2015 06:32:48 -0400 Message-ID: <558A8743.5040105@users.sourceforge.net> Date: Wed, 24 Jun 2015 12:32:35 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Len Brown , "Rafael J. Wysocki" , linux-acpi@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org Subject: ACPI-APEI: Make exception handling a bit more efficient in __einj_error_trigger() References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Fqt5duMF/proPFWxUIT7UkuNuOJBDAIBRuCJD6pacwtjACbLd/q +bUREl/zcvI2vNYd1Lv3dP39UOd/A9dG245hgSYLpKMai7WkLZuhawNLW1uE1G7GAKMdqBG nMPZGZ+iiITjg4GQcHmvIHk5rI2hR63zgxpeQSBVGF7mCj2mSfEKG14hBUVPaIU5o4VSlxk K7XsRmWn0JLJ4ouhQUvdA== X-UI-Out-Filterresults: notjunk:1;V01:K0:eY9pddFFZQY=:knVEwwppZb47DyhTMLcP85 IdTfYvZ4hRRhM7WzU/1r09QNjSbleCrYuqVo0+FX/1zNxpYSw0MXujW6vciOVdxzY4jenKo0M b1GJdffiKAaYLXDV23NfR/DDVC1itWQVu/Yk7L3R5xpRgWSvwA323Mi9Y0xHM8xJoCXYGdc2X KqhmBN3Fbbx1XvArUfmUHBovcvbmNj+Fpzo78cJB7gn9ziXXSbVJnToHNOE3dzNv2lfAfj5T7 CgBjs2m3vRVn3pWuLS7wcQvX5OV33YYAbuQvrUhKQYV52hF3aKAukfs6awJD4IgFOaAZsytuO ciVoZPoWynax1rjnNz75HBfWXWcXMW2YZygloVkxTZ6xQALN3QAciRL8HWxEk3laEaIF4olFF fkP4aCtFDhrJwr5GMz9tv4tAw0tr4NtNzFI6bSG/ZPyovz1m/WADTV1IQyq9NS83GcT68+2Zf g3x07U08F28Hn0W/A9YHtauBffGMOl51Zdl/2/1sxiQ4ZU3L0MMTpOwAX1RfYR4bSK3x9UFJd mmtnoGo2u6TVYRCLEcmmOsgBNuIcxIFgjRJwgKeHSXFd6Dq5ARk4CNiddoz+2NM2twWM14NUw voaBcWMgI0s1KT0HNeBfFClXgPdsCzYo47O6SDMzddbm/7ktIn/6cdsC55mH3AvqsBP+IAZBW DS7VenZQJjrJqRjV4krU0wAKGTzklwd81O3Lr9syfsG4FM6dJpsV+fLs3DrzRSXztVC4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 24 Jun 2015 11:41:46 +0200 Return from the __einj_error_trigger() function directly after a failed call for the request_mem_region() function according to the current Linux coding style convention. Drop an unnecessary initialisation for the variable "trigger_tab" then. Signed-off-by: Markus Elfring --- drivers/acpi/apei/einj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index a095d4f..c3a2c06 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -299,7 +299,7 @@ static struct acpi_generic_address *einj_get_trigger_parameter_region( static int __einj_error_trigger(u64 trigger_paddr, u32 type, u64 param1, u64 param2) { - struct acpi_einj_trigger *trigger_tab = NULL; + struct acpi_einj_trigger *trigger_tab; struct apei_exec_context trigger_ctx; struct apei_resources trigger_resources; struct acpi_whea_header *trigger_entry; @@ -316,7 +316,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, (unsigned long long)trigger_paddr, (unsigned long long)trigger_paddr + sizeof(*trigger_tab) - 1); - goto out; + return rc; } trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab)); if (!trigger_tab) { @@ -407,7 +407,7 @@ out_rel_entry: table_size - sizeof(*trigger_tab)); out_rel_header: release_mem_region(trigger_paddr, sizeof(*trigger_tab)); -out: + if (trigger_tab) iounmap(trigger_tab); -- 2.4.4