[media] dvb_usb_v2: rename device_init/device_exit to probe/disconnect

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h
index 78b69286a80371805338a0d0d670dcdc3f586cf5..e67333b4a72689c710ae8afebe6e3dddd8897a68 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -350,9 +350,9 @@ struct dvb_usb_device {
        void *priv;
 };
 
-extern int dvb_usbv2_device_init(struct usb_interface *,
+extern int dvb_usbv2_probe(struct usb_interface *,
                const struct usb_device_id *);
-extern void dvb_usbv2_device_exit(struct usb_interface *);
+extern void dvb_usbv2_disconnect(struct usb_interface *);
 
 /* the generic read/write method for device control */
 extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16,

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index aa7caa5c4684e9d7b7594ed3c5c626390005e970..c0857d03275e943f56fcd8d1896b73beeb2062de 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -342,7 +342,7 @@ exit_usb_driver_release_interface:
        return;
 }
 
-int dvb_usbv2_device_init(struct usb_interface *intf,
+int dvb_usbv2_probe(struct usb_interface *intf,
                const struct usb_device_id *id)
 {
        int ret;
@@ -389,10 +389,9 @@ err:
        pr_debug("%s: failed=%d\n", __func__, ret);
        return ret;
 }
+EXPORT_SYMBOL(dvb_usbv2_probe);
 
-EXPORT_SYMBOL(dvb_usbv2_device_init);
-
-void dvb_usbv2_device_exit(struct usb_interface *intf)
+void dvb_usbv2_disconnect(struct usb_interface *intf)
 {
        struct dvb_usb_device *d = usb_get_intfdata(intf);
        const char *name = "generic DVB-USB module";
@@ -416,7 +415,7 @@ void dvb_usbv2_device_exit(struct usb_interface *intf)
        pr_info("%s: '%s' successfully deinitialized and disconnected\n",
                        KBUILD_MODNAME, name);
 }
-EXPORT_SYMBOL(dvb_usbv2_device_exit);
+EXPORT_SYMBOL(dvb_usbv2_disconnect);
 
 MODULE_VERSION("1.0");
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");