| Message ID | 20210219111501.14261-8-arnaud.pouliquen@foss.st.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | introduce a generic IOCTL interface for RPMsg channels management | expand |
On Fri, Feb 19, 2021 at 12:14:52PM +0100, Arnaud Pouliquen wrote: > As driver is now the rpmsg_ioctl, rename the function. > In addition, initialize the rpdev addresses to RPMSG_ADDR_ANY as not > defined. This patch works but the changelog needs a rework. The title reflects the essence of changes but the text of the changelog doesn't. > > Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com> > --- > drivers/rpmsg/qcom_glink_native.c | 2 +- > drivers/rpmsg/qcom_smd.c | 2 +- > drivers/rpmsg/rpmsg_ctrl.c | 2 +- > drivers/rpmsg/rpmsg_internal.h | 10 ++++++---- > 4 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c > index 27a05167c18c..d4e4dd482614 100644 > --- a/drivers/rpmsg/qcom_glink_native.c > +++ b/drivers/rpmsg/qcom_glink_native.c > @@ -1625,7 +1625,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_ctrl_register_device(rpdev); > } > > struct qcom_glink *qcom_glink_native_probe(struct device *dev, > diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c > index 19903de6268d..40a1c415c775 100644 > --- a/drivers/rpmsg/qcom_smd.c > +++ b/drivers/rpmsg/qcom_smd.c > @@ -1097,7 +1097,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_ctrl_register_device(&qsdev->rpdev); > } > > /* > diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c > index fa05b67d24da..2e43b4096aa8 100644 > --- a/drivers/rpmsg/rpmsg_ctrl.c > +++ b/drivers/rpmsg/rpmsg_ctrl.c > @@ -180,7 +180,7 @@ static struct rpmsg_driver rpmsg_ctrl_driver = { > .probe = rpmsg_ctrl_probe, > .remove = rpmsg_ctrl_remove, > .drv = { > - .name = "rpmsg_chrdev", > + .name = KBUILD_MODNAME, > }, > }; > > diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h > index a76c344253bf..7428f4465d17 100644 > --- a/drivers/rpmsg/rpmsg_internal.h > +++ b/drivers/rpmsg/rpmsg_internal.h > @@ -82,16 +82,18 @@ 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_ctrl_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_ctrl_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"; > + rpdev->src = RPMSG_ADDR_ANY; > + rpdev->dst = RPMSG_ADDR_ANY; > > return rpmsg_register_device(rpdev); > } > -- > 2.17.1 >
diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 27a05167c18c..d4e4dd482614 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1625,7 +1625,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_ctrl_register_device(rpdev); } struct qcom_glink *qcom_glink_native_probe(struct device *dev, diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 19903de6268d..40a1c415c775 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1097,7 +1097,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_ctrl_register_device(&qsdev->rpdev); } /* diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c index fa05b67d24da..2e43b4096aa8 100644 --- a/drivers/rpmsg/rpmsg_ctrl.c +++ b/drivers/rpmsg/rpmsg_ctrl.c @@ -180,7 +180,7 @@ static struct rpmsg_driver rpmsg_ctrl_driver = { .probe = rpmsg_ctrl_probe, .remove = rpmsg_ctrl_remove, .drv = { - .name = "rpmsg_chrdev", + .name = KBUILD_MODNAME, }, }; diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h index a76c344253bf..7428f4465d17 100644 --- a/drivers/rpmsg/rpmsg_internal.h +++ b/drivers/rpmsg/rpmsg_internal.h @@ -82,16 +82,18 @@ 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_ctrl_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_ctrl_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"; + rpdev->src = RPMSG_ADDR_ANY; + rpdev->dst = RPMSG_ADDR_ANY; return rpmsg_register_device(rpdev); }
As driver is now the rpmsg_ioctl, rename the function. In addition, initialize the rpdev addresses to RPMSG_ADDR_ANY as not defined. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com> --- drivers/rpmsg/qcom_glink_native.c | 2 +- drivers/rpmsg/qcom_smd.c | 2 +- drivers/rpmsg/rpmsg_ctrl.c | 2 +- drivers/rpmsg/rpmsg_internal.h | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-)