| Message ID | 20201013232519.1367542-9-mathieu.poirier@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | rpmsg: Make RPMSG name service modular | expand |
On 10/14/20 1:25 AM, Mathieu Poirier wrote: > Make function rpmsg_register_device() and rpmsg_unregister_device() > functions public so that they can be used by other clients. While > doing so get rid of two obsolete function, i.e register_rpmsg_device() > and unregister_rpmsg_device(), to prevent confusion. > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- > drivers/rpmsg/rpmsg_internal.h | 4 ---- > include/linux/rpmsg.h | 12 ++++++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h > index b9b34b416b7b..70de053581bd 100644 > --- a/drivers/rpmsg/rpmsg_internal.h > +++ b/drivers/rpmsg/rpmsg_internal.h > @@ -49,10 +49,6 @@ struct rpmsg_endpoint_ops { > poll_table *wait); > }; > > -int rpmsg_register_device(struct rpmsg_device *rpdev); > -int rpmsg_unregister_device(struct device *parent, > - struct rpmsg_channel_info *chinfo); > - > struct device *rpmsg_find_device(struct device *parent, > struct rpmsg_channel_info *chinfo); > > diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h > index eb70463a9f2e..0b3ec18ddbaa 100644 > --- a/include/linux/rpmsg.h > +++ b/include/linux/rpmsg.h > @@ -188,8 +188,9 @@ static inline __rpmsg64 cpu_to_rpmsg64(struct rpmsg_device *rpdev, u64 val) > > #if IS_ENABLED(CONFIG_RPMSG) > > -int register_rpmsg_device(struct rpmsg_device *dev); > -void unregister_rpmsg_device(struct rpmsg_device *dev); > +int rpmsg_register_device(struct rpmsg_device *rpdev); > +int rpmsg_unregister_device(struct device *parent, > + struct rpmsg_channel_info *chinfo); > int __register_rpmsg_driver(struct rpmsg_driver *drv, struct module *owner); > void unregister_rpmsg_driver(struct rpmsg_driver *drv); > void rpmsg_destroy_ept(struct rpmsg_endpoint *); > @@ -212,15 +213,18 @@ __poll_t rpmsg_poll(struct rpmsg_endpoint *ept, struct file *filp, > > #else > > -static inline int register_rpmsg_device(struct rpmsg_device *dev) > +static inline int rpmsg_register_device(struct rpmsg_device *rpdev) > { > return -ENXIO; > } > > -static inline void unregister_rpmsg_device(struct rpmsg_device *dev) > +static inline int rpmsg_unregister_device(struct device *parent, > + struct rpmsg_channel_info *chinfo) > { > /* This shouldn't be possible */ > WARN_ON(1); > + > + return -ENXIO; > } > > static inline int __register_rpmsg_driver(struct rpmsg_driver *drv, > Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Thanks, Arnaud
diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h index b9b34b416b7b..70de053581bd 100644 --- a/drivers/rpmsg/rpmsg_internal.h +++ b/drivers/rpmsg/rpmsg_internal.h @@ -49,10 +49,6 @@ struct rpmsg_endpoint_ops { poll_table *wait); }; -int rpmsg_register_device(struct rpmsg_device *rpdev); -int rpmsg_unregister_device(struct device *parent, - struct rpmsg_channel_info *chinfo); - struct device *rpmsg_find_device(struct device *parent, struct rpmsg_channel_info *chinfo); diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index eb70463a9f2e..0b3ec18ddbaa 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -188,8 +188,9 @@ static inline __rpmsg64 cpu_to_rpmsg64(struct rpmsg_device *rpdev, u64 val) #if IS_ENABLED(CONFIG_RPMSG) -int register_rpmsg_device(struct rpmsg_device *dev); -void unregister_rpmsg_device(struct rpmsg_device *dev); +int rpmsg_register_device(struct rpmsg_device *rpdev); +int rpmsg_unregister_device(struct device *parent, + struct rpmsg_channel_info *chinfo); int __register_rpmsg_driver(struct rpmsg_driver *drv, struct module *owner); void unregister_rpmsg_driver(struct rpmsg_driver *drv); void rpmsg_destroy_ept(struct rpmsg_endpoint *); @@ -212,15 +213,18 @@ __poll_t rpmsg_poll(struct rpmsg_endpoint *ept, struct file *filp, #else -static inline int register_rpmsg_device(struct rpmsg_device *dev) +static inline int rpmsg_register_device(struct rpmsg_device *rpdev) { return -ENXIO; } -static inline void unregister_rpmsg_device(struct rpmsg_device *dev) +static inline int rpmsg_unregister_device(struct device *parent, + struct rpmsg_channel_info *chinfo) { /* This shouldn't be possible */ WARN_ON(1); + + return -ENXIO; } static inline int __register_rpmsg_driver(struct rpmsg_driver *drv,
Make function rpmsg_register_device() and rpmsg_unregister_device() functions public so that they can be used by other clients. While doing so get rid of two obsolete function, i.e register_rpmsg_device() and unregister_rpmsg_device(), to prevent confusion. Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- drivers/rpmsg/rpmsg_internal.h | 4 ---- include/linux/rpmsg.h | 12 ++++++++---- 2 files changed, 8 insertions(+), 8 deletions(-)