lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 207/321] firmware: arm_sdei: Fix DT platform device creation
    Date
    From: James Morse <james.morse@arm.com>

    [ Upstream commit acafce48b07bf5f9994a38e7fe237193d43d092e ]

    It turns out the dt-probing part of this wasn't tested properly after it
    was merged. commit 3aa0582fdb82 ("of: platform: populate /firmware/ node
    from of_platform_default_populate_init()") changed the core-code to
    generate the platform devices, meaning the driver's attempt fails, and it
    bails out.

    Fix this by removing the manual platform-device creation for DT systems,
    core code has always done this for us.

    CC: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
    Signed-off-by: James Morse <james.morse@arm.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/firmware/arm_sdei.c | 5 -----
    1 file changed, 5 deletions(-)

    diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
    index dffb47c6b4801..c64c7da738297 100644
    --- a/drivers/firmware/arm_sdei.c
    +++ b/drivers/firmware/arm_sdei.c
    @@ -1009,7 +1009,6 @@ static struct platform_driver sdei_driver = {

    static bool __init sdei_present_dt(void)
    {
    - struct platform_device *pdev;
    struct device_node *np, *fw_np;

    fw_np = of_find_node_by_name(NULL, "firmware");
    @@ -1019,11 +1018,7 @@ static bool __init sdei_present_dt(void)
    np = of_find_matching_node(fw_np, sdei_of_match);
    if (!np)
    return false;
    -
    - pdev = of_platform_device_create(np, sdei_driver.driver.name, NULL);
    of_node_put(np);
    - if (!pdev)
    - return false;

    return true;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 00:03    [W:4.105 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site