Commit 930eec0b authored by Siddharth Gupta's avatar Siddharth Gupta Committed by Bjorn Andersson
Browse files

remoteproc: core: Fix cdev remove and rproc del 



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: default avatarSiddharth Gupta <sidgup@codeaurora.org>
Link: https://lore.kernel.org/r/1623723671-5517-4-git-send-email-sidgup@codeaurora.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 519346ec

drivers/remoteproc/remoteproc_cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,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)

drivers/remoteproc/remoteproc_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2619,7 +2619,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);
@@ -2630,6 +2629,7 @@ int rproc_del(struct rproc *rproc) 
	synchronize_rcu();



	device_del(&rproc->dev);

	rproc_char_device_remove(rproc);



	return 0;

}