Commit 472f84ee authored by Arnaud Pouliquen's avatar Arnaud Pouliquen Committed by Bjorn Andersson
Browse files

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: default avatarArnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220124102524.295783-8-arnaud.pouliquen@foss.st.com
parent 617d3293

drivers/rpmsg/qcom_glink_native.c

+1 −1
Original line number Diff line number Diff line
@@ -1715,7 +1715,7 @@ static int qcom_glink_create_chrdev(struct qcom_glink *glink) 
	rpdev->dev.parent = glink->dev;

	rpdev->dev.release = qcom_glink_device_release;



	return rpmsg_chrdev_register_device(rpdev);

	return rpmsg_ctrldev_register_device(rpdev);

}



struct qcom_glink *qcom_glink_native_probe(struct device *dev,

drivers/rpmsg/qcom_smd.c

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ static int qcom_smd_create_chrdev(struct qcom_smd_edge *edge) 
	qsdev->rpdev.dev.parent = &edge->dev;

	qsdev->rpdev.dev.release = qcom_smd_release_device;



	return rpmsg_chrdev_register_device(&qsdev->rpdev);

	return rpmsg_ctrldev_register_device(&qsdev->rpdev);

}



/*

drivers/rpmsg/rpmsg_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct rpmsg_driver rpmsg_ctrldev_driver = { 
	.probe = rpmsg_ctrldev_probe,

	.remove = rpmsg_ctrldev_remove,

	.drv = {

		.name = "rpmsg_chrdev",

		.name = "rpmsg_ctrl",

	},

};

drivers/rpmsg/rpmsg_internal.h

+4 −4
Original line number Diff line number Diff line
@@ -86,16 +86,16 @@ struct rpmsg_device *rpmsg_create_channel(struct rpmsg_device *rpdev, 
int rpmsg_release_channel(struct rpmsg_device *rpdev,

			  struct rpmsg_channel_info *chinfo);

/**

 * rpmsg_chrdev_register_device() - register chrdev device based on rpdev

 * rpmsg_ctrldev_register_device() - register a char device for control based on rpdev

 * @rpdev:	prepared rpdev to be used for creating endpoints

 *

 * This function wraps rpmsg_register_device() preparing the rpdev for use as

 * basis for the rpmsg chrdev.

 */

static inline int rpmsg_chrdev_register_device(struct rpmsg_device *rpdev)

static inline int rpmsg_ctrldev_register_device(struct rpmsg_device *rpdev)

{

	strcpy(rpdev->id.name, "rpmsg_chrdev");

	rpdev->driver_override = "rpmsg_chrdev";

	strcpy(rpdev->id.name, "rpmsg_ctrl");

	rpdev->driver_override = "rpmsg_ctrl";



	return rpmsg_register_device(rpdev);

}

drivers/rpmsg/virtio_rpmsg_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static struct rpmsg_device *rpmsg_virtio_add_ctrl_dev(struct virtio_device *vdev 
	rpdev_ctrl->dev.release = virtio_rpmsg_release_device;

	rpdev_ctrl->little_endian = virtio_is_little_endian(vrp->vdev);



	err = rpmsg_chrdev_register_device(rpdev_ctrl);

	err = rpmsg_ctrldev_register_device(rpdev_ctrl);

	if (err) {

		kfree(vch);

		return ERR_PTR(err);