| Message ID | 20220603163158.612513-3-arnaud.pouliquen@foss.st.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | remoteproc: restructure the remoteproc VirtIO device | expand |
On Fri, Jun 03, 2022 at 06:31:56PM +0200, Arnaud Pouliquen wrote: > The rproc structure contains a list of registered rproc_vdev structure. > To be able to move the management of the rproc_vdev structure in > remoteproc_virtio.c (i.e rproc_rvdev_add_device and > rproc_rvdev_remove_device functions), introduce the rproc_add_rvdev Function rproc_rvdev_remove_device() no longer exists and shouldn't be part of this changelog. > and rproc_remove_rvdev functions. > > Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com> > Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- > Updates vs previous revision (based on Mathieu Poirier's comments): > - Fix function name in commit message and add Mathieu's Reviewed-by. > --- > drivers/remoteproc/remoteproc_core.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index c438c32f7f0d..86147efc0aad 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -484,6 +484,18 @@ static int copy_dma_range_map(struct device *to, struct device *from) > return 0; > } > > +static void rproc_add_rvdev(struct rproc *rproc, struct rproc_vdev *rvdev) > +{ > + if (rvdev && rproc) > + list_add_tail(&rvdev->node, &rproc->rvdevs); > +} > + > +static void rproc_remove_rvdev(struct rproc_vdev *rvdev) > +{ > + if (rvdev) > + list_del(&rvdev->node); > +} > + > static struct rproc_vdev * > rproc_rvdev_add_device(struct rproc *rproc, struct rproc_vdev_data *rvdev_data) > { > @@ -547,7 +559,7 @@ rproc_rvdev_add_device(struct rproc *rproc, struct rproc_vdev_data *rvdev_data) > goto unwind_vring_allocations; > } > > - list_add_tail(&rvdev->node, &rproc->rvdevs); > + rproc_add_rvdev(rproc, rvdev); > > rvdev->subdev.start = rproc_vdev_do_start; > rvdev->subdev.stop = rproc_vdev_do_stop; > @@ -577,7 +589,7 @@ void rproc_vdev_release(struct kref *ref) > } > > rproc_remove_subdev(rproc, &rvdev->subdev); > - list_del(&rvdev->node); > + rproc_remove_rvdev(rvdev); > device_unregister(&rvdev->dev); > } > > -- > 2.24.3 >
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index c438c32f7f0d..86147efc0aad 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -484,6 +484,18 @@ static int copy_dma_range_map(struct device *to, struct device *from) return 0; } +static void rproc_add_rvdev(struct rproc *rproc, struct rproc_vdev *rvdev) +{ + if (rvdev && rproc) + list_add_tail(&rvdev->node, &rproc->rvdevs); +} + +static void rproc_remove_rvdev(struct rproc_vdev *rvdev) +{ + if (rvdev) + list_del(&rvdev->node); +} + static struct rproc_vdev * rproc_rvdev_add_device(struct rproc *rproc, struct rproc_vdev_data *rvdev_data) { @@ -547,7 +559,7 @@ rproc_rvdev_add_device(struct rproc *rproc, struct rproc_vdev_data *rvdev_data) goto unwind_vring_allocations; } - list_add_tail(&rvdev->node, &rproc->rvdevs); + rproc_add_rvdev(rproc, rvdev); rvdev->subdev.start = rproc_vdev_do_start; rvdev->subdev.stop = rproc_vdev_do_stop; @@ -577,7 +589,7 @@ void rproc_vdev_release(struct kref *ref) } rproc_remove_subdev(rproc, &rvdev->subdev); - list_del(&rvdev->node); + rproc_remove_rvdev(rvdev); device_unregister(&rvdev->dev); }