Skip to content

Commit 472f84e

Browse files
arnopoandersson
authored andcommitted
rpmsg: Update rpmsg_chrdev_register_device function
The rpmsg_chrdev driver has been replaced by the rpmsg_ctrl driver for the /dev/rpmsg_ctrlX devices management. The reference for the driver override is now the rpmsg_ctrl. Update the rpmsg_chrdev_register_device function to reflect the update, and rename the function to use the rpmsg_ctrldev prefix. The platform drivers are updated accordingly. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com> Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20220124102524.295783-8-arnaud.pouliquen@foss.st.com
1 parent 617d329 commit 472f84e

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

drivers/rpmsg/qcom_glink_native.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,7 @@ static int qcom_glink_create_chrdev(struct qcom_glink *glink)
17151715
rpdev->dev.parent = glink->dev;
17161716
rpdev->dev.release = qcom_glink_device_release;
17171717

1718-
return rpmsg_chrdev_register_device(rpdev);
1718+
return rpmsg_ctrldev_register_device(rpdev);
17191719
}
17201720

17211721
struct qcom_glink *qcom_glink_native_probe(struct device *dev,

drivers/rpmsg/qcom_smd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,7 @@ static int qcom_smd_create_chrdev(struct qcom_smd_edge *edge)
11131113
qsdev->rpdev.dev.parent = &edge->dev;
11141114
qsdev->rpdev.dev.release = qcom_smd_release_device;
11151115

1116-
return rpmsg_chrdev_register_device(&qsdev->rpdev);
1116+
return rpmsg_ctrldev_register_device(&qsdev->rpdev);
11171117
}
11181118

11191119
/*

drivers/rpmsg/rpmsg_ctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static struct rpmsg_driver rpmsg_ctrldev_driver = {
179179
.probe = rpmsg_ctrldev_probe,
180180
.remove = rpmsg_ctrldev_remove,
181181
.drv = {
182-
.name = "rpmsg_chrdev",
182+
.name = "rpmsg_ctrl",
183183
},
184184
};
185185

drivers/rpmsg/rpmsg_internal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ struct rpmsg_device *rpmsg_create_channel(struct rpmsg_device *rpdev,
8686
int rpmsg_release_channel(struct rpmsg_device *rpdev,
8787
struct rpmsg_channel_info *chinfo);
8888
/**
89-
* rpmsg_chrdev_register_device() - register chrdev device based on rpdev
89+
* rpmsg_ctrldev_register_device() - register a char device for control based on rpdev
9090
* @rpdev: prepared rpdev to be used for creating endpoints
9191
*
9292
* This function wraps rpmsg_register_device() preparing the rpdev for use as
9393
* basis for the rpmsg chrdev.
9494
*/
95-
static inline int rpmsg_chrdev_register_device(struct rpmsg_device *rpdev)
95+
static inline int rpmsg_ctrldev_register_device(struct rpmsg_device *rpdev)
9696
{
97-
strcpy(rpdev->id.name, "rpmsg_chrdev");
98-
rpdev->driver_override = "rpmsg_chrdev";
97+
strcpy(rpdev->id.name, "rpmsg_ctrl");
98+
rpdev->driver_override = "rpmsg_ctrl";
9999

100100
return rpmsg_register_device(rpdev);
101101
}

drivers/rpmsg/virtio_rpmsg_bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ static struct rpmsg_device *rpmsg_virtio_add_ctrl_dev(struct virtio_device *vdev
849849
rpdev_ctrl->dev.release = virtio_rpmsg_release_device;
850850
rpdev_ctrl->little_endian = virtio_is_little_endian(vrp->vdev);
851851

852-
err = rpmsg_chrdev_register_device(rpdev_ctrl);
852+
err = rpmsg_ctrldev_register_device(rpdev_ctrl);
853853
if (err) {
854854
kfree(vch);
855855
return ERR_PTR(err);

0 commit comments

Comments
 (0)