diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2013-12-03 15:15:29 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-12-12 13:43:38 -0600 |
| commit | 9c2b85f4f99cb5c5f4b8e29ef15e344f93ec5be1 (patch) | |
| tree | 2bf23fc517695312880e0b61a9744703a91ac87d /drivers/usb/gadget/f_rndis.c | |
| parent | 31f89db1b81ea1c54ca7d186a0c0ebab0d4988f0 (diff) | |
| download | op-kernel-dev-9c2b85f4f99cb5c5f4b8e29ef15e344f93ec5be1.zip op-kernel-dev-9c2b85f4f99cb5c5f4b8e29ef15e344f93ec5be1.tar.gz | |
usb: gadget: rndis: merge u_rndis.ko with usb_f_rndis.ko
The rndis function's users use only the new interface, so the two modules
can be merged.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/f_rndis.c')
| -rw-r--r-- | drivers/usb/gadget/f_rndis.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index 9d7c995..c11761c 100644 --- a/drivers/usb/gadget/f_rndis.c +++ b/drivers/usb/gadget/f_rndis.c @@ -979,6 +979,26 @@ static struct usb_function *rndis_alloc(struct usb_function_instance *fi) return &rndis->port.func; } -DECLARE_USB_FUNCTION_INIT(rndis, rndis_alloc_inst, rndis_alloc); +DECLARE_USB_FUNCTION(rndis, rndis_alloc_inst, rndis_alloc); + +static int __init rndis_mod_init(void) +{ + int ret; + + ret = rndis_init(); + if (ret) + return ret; + + return usb_function_register(&rndisusb_func); +} +module_init(rndis_mod_init); + +static void __exit rndis_mod_exit(void) +{ + usb_function_unregister(&rndisusb_func); + rndis_exit(); +} +module_exit(rndis_mod_exit); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("David Brownell"); |
