lkml.org 
[lkml]   [2015]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectACPI-APEI: Make exception handling a bit more efficient in __einj_error_trigger()
    From: Markus Elfring <elfring@users.sourceforge.net>
    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 <elfring@users.sourceforge.net>
    ---
    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


    \
     
     \ /
      Last update: 2015-06-24 12:41    [W:4.022 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site