lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 151/292] remoteproc: core: Fix cdev remove and rproc del
    Date
    From: Siddharth Gupta <sidgup@codeaurora.org>

    [ Upstream commit 930eec0be20c93a53160c74005a1485a230e6911 ]

    The rproc_char_device_remove() call currently unmaps the cdev
    region instead of simply deleting the cdev that was added as a
    part of the rproc_char_device_add() call. This change fixes that
    behaviour, and also fixes the order in which device_del() and
    cdev_del() need to be called.

    Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
    Link: https://lore.kernel.org/r/1623723671-5517-4-git-send-email-sidgup@codeaurora.org
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/remoteproc/remoteproc_cdev.c | 2 +-
    drivers/remoteproc/remoteproc_core.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c
    index b19ea3057bde..ff92ed25d8b0 100644
    --- a/drivers/remoteproc/remoteproc_cdev.c
    +++ b/drivers/remoteproc/remoteproc_cdev.c
    @@ -111,7 +111,7 @@ int rproc_char_device_add(struct rproc *rproc)

    void rproc_char_device_remove(struct rproc *rproc)
    {
    - __unregister_chrdev(MAJOR(rproc->dev.devt), rproc->index, 1, "remoteproc");
    + cdev_del(&rproc->cdev);
    }

    void __init rproc_init_cdev(void)
    diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
    index ab150765d124..d9d2a240dd58 100644
    --- a/drivers/remoteproc/remoteproc_core.c
    +++ b/drivers/remoteproc/remoteproc_core.c
    @@ -2357,7 +2357,6 @@ int rproc_del(struct rproc *rproc)
    mutex_unlock(&rproc->lock);

    rproc_delete_debug_dir(rproc);
    - rproc_char_device_remove(rproc);

    /* the rproc is downref'ed as soon as it's removed from the klist */
    mutex_lock(&rproc_list_mutex);
    @@ -2368,6 +2367,7 @@ int rproc_del(struct rproc *rproc)
    synchronize_rcu();

    device_del(&rproc->dev);
    + rproc_char_device_remove(rproc);

    return 0;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 20:41    [W:4.032 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site