From bc3c57c13256c748a4e71d2ea7481d0c953e88e1 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Wed, 4 May 2016 17:01:36 -0500 Subject: rpmsg: add THIS_MODULE to rpmsg_driver in rpmsg core Add register_rpmsg_driver helper macro that adds THIS_MODULE to rpmsg_driver for the registering driver. We rename and modify the existing register_rpmsg_driver to enable this. Signed-off-by: Andrew F. Davis Acked-by: Suman Anna Signed-off-by: Bjorn Andersson --- include/linux/rpmsg.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/linux/rpmsg.h') diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index 82a673905edb..7ff5790c185a 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -169,7 +169,7 @@ struct rpmsg_driver { int register_rpmsg_device(struct rpmsg_channel *dev); void unregister_rpmsg_device(struct rpmsg_channel *dev); -int register_rpmsg_driver(struct rpmsg_driver *drv); +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 *); struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *, @@ -177,6 +177,10 @@ struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *, int rpmsg_send_offchannel_raw(struct rpmsg_channel *, u32, u32, void *, int, bool); +/* use a macro to avoid include chaining to get THIS_MODULE */ +#define register_rpmsg_driver(drv) \ + __register_rpmsg_driver(drv, THIS_MODULE) + /** * rpmsg_send() - send a message across to the remote processor * @rpdev: the rpmsg channel -- cgit v1.2.3 From f3d9f1ce079370d19b34fc9927b8b1355ac98503 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Wed, 4 May 2016 17:01:38 -0500 Subject: rpmsg: add helper macro module_rpmsg_driver This patch introduces the module_rpmsg_driver macro which is a convenience macro for rpmsg driver modules similar to module_platform_driver. It is intended to be used by drivers which init/exit section does nothing but register/unregister the rpmsg driver. By using this macro it is possible to eliminate a few lines of boilerplate code per rpmsg driver. Signed-off-by: Andrew F. Davis Signed-off-by: Bjorn Andersson --- include/linux/rpmsg.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/linux/rpmsg.h') diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index 7ff5790c185a..ada50ff36da0 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -181,6 +181,18 @@ rpmsg_send_offchannel_raw(struct rpmsg_channel *, u32, u32, void *, int, bool); #define register_rpmsg_driver(drv) \ __register_rpmsg_driver(drv, THIS_MODULE) +/** + * module_rpmsg_driver() - Helper macro for registering an rpmsg driver + * @__rpmsg_driver: rpmsg_driver struct + * + * Helper macro for rpmsg drivers which do not do anything special in module + * init/exit. This eliminates a lot of boilerplate. Each module may only + * use this macro once, and calling it replaces module_init() and module_exit() + */ +#define module_rpmsg_driver(__rpmsg_driver) \ + module_driver(__rpmsg_driver, register_rpmsg_driver, \ + unregister_rpmsg_driver) + /** * rpmsg_send() - send a message across to the remote processor * @rpdev: the rpmsg channel -- cgit v1.2.3