[media] dvb_usb_v2: rename device_init/device_exit to probe/disconnect (6b8c8c40) · Commits · 戴 / test

drivers/media/dvb/dvb-usb/dvb_usb.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,

+4 −5

Original line number	Diff line number	Diff line
		@@ -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>");