lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 079/633] RAS/CEC: Fix cec_init() prototype
    Date
    From: Luca Stefani <luca.stefani.ge1@gmail.com>

    [ Upstream commit 85e6084e0b436cabe9c909e679937998ffbf9c9d ]

    late_initcall() expects a function that returns an integer. Update the
    function signature to match.

    [ bp: Massage commit message into proper sentences. ]

    Fixes: 9554bfe403bd ("x86/mce: Convert the CEC to use the MCE notifier")
    Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
    Tested-by: Sami Tolvanen <samitolvanen@google.com>
    Link: https://lkml.kernel.org/r/20200805095708.83939-1-luca.stefani.ge1@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ras/cec.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c
    index 569d9ad2c5942..6939aa5b3dc7f 100644
    --- a/drivers/ras/cec.c
    +++ b/drivers/ras/cec.c
    @@ -553,20 +553,20 @@ static struct notifier_block cec_nb = {
    .priority = MCE_PRIO_CEC,
    };

    -static void __init cec_init(void)
    +static int __init cec_init(void)
    {
    if (ce_arr.disabled)
    - return;
    + return -ENODEV;

    ce_arr.array = (void *)get_zeroed_page(GFP_KERNEL);
    if (!ce_arr.array) {
    pr_err("Error allocating CE array page!\n");
    - return;
    + return -ENOMEM;
    }

    if (create_debugfs_nodes()) {
    free_page((unsigned long)ce_arr.array);
    - return;
    + return -ENOMEM;
    }

    INIT_DELAYED_WORK(&cec_work, cec_work_fn);
    @@ -575,6 +575,7 @@ static void __init cec_init(void)
    mce_register_decode_chain(&cec_nb);

    pr_info("Correctable Errors collector initialized.\n");
    + return 0;
    }
    late_initcall(cec_init);

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:27    [W:2.985 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site