---

yaml
---
r: 330596
b: refs/heads/master
c: 6b8c8c4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a177c72bf57f70585f08231145b2431b4182b2b4
+refs/heads/master: 6b8c8c40894a88035fb29472a25f6864cd2e8197

trunk/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,

trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c

@@ -342,7 +342,7 @@ static void dvb_usbv2_init_work(struct work_struct *work)
 	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 @@ int dvb_usbv2_device_init(struct usb_interface *intf,
 	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>");