diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 17:17:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 17:17:20 -0700 |
commit | 676d9735cd010fc439566e2b6e9b6adc3e1179ef (patch) | |
tree | 069b84dda1a4cfa92a9d2e4b2b20ca507f589f49 /drivers | |
parent | 888dae5361e605efc553b645a7c95bbcc5e904db (diff) | |
parent | b4f78259d593858feb85e02c195cf374f932feef (diff) | |
download | linux-676d9735cd010fc439566e2b6e9b6adc3e1179ef.tar.bz2 |
Merge tag 'rpmsg-v4.7' of git://github.com/andersson/remoteproc
Pull rpmsg updates from Bjorn Andersson:
"Refactor rpmsg module registration to follow other subsystems; by
introduction of module_rpmsg_driver and hiding of THIS_MODULE from
clients"
* tag 'rpmsg-v4.7' of git://github.com/andersson/remoteproc:
rpmsg: use module_rpmsg_driver in existing drivers and examples
rpmsg: add helper macro module_rpmsg_driver
rpmsg: drop owner assignment from rpmsg_drivers
rpmsg: add THIS_MODULE to rpmsg_driver in rpmsg core
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/rpmsg/virtio_rpmsg_bus.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 1fcd27c1f183..fe03b2aef450 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -436,17 +436,19 @@ static struct bus_type rpmsg_bus = { }; /** - * register_rpmsg_driver() - register an rpmsg driver with the rpmsg bus + * __register_rpmsg_driver() - register an rpmsg driver with the rpmsg bus * @rpdrv: pointer to a struct rpmsg_driver + * @owner: owning module/driver * * Returns 0 on success, and an appropriate error value on failure. */ -int register_rpmsg_driver(struct rpmsg_driver *rpdrv) +int __register_rpmsg_driver(struct rpmsg_driver *rpdrv, struct module *owner) { rpdrv->drv.bus = &rpmsg_bus; + rpdrv->drv.owner = owner; return driver_register(&rpdrv->drv); } -EXPORT_SYMBOL(register_rpmsg_driver); +EXPORT_SYMBOL(__register_rpmsg_driver); /** * unregister_rpmsg_driver() - unregister an rpmsg driver from the rpmsg bus |