remoteproc: core: Fix cdev remove and rproc del

[ 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>

diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c
index b19ea3057bde4b6beded80c99939187bec1b2e32..ff92ed25d8b0a0a8e71ed72b54cb03eddd678877 100644 (file)
--- 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 ab150765d1243fe24bf91e55eacd10531381fe02..d9d2a240dd5895dd246218f97c75862b1ff8ec4a 100644 (file)
--- 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;
 }