Skip to content

Commit

Permalink
[media] dvb_usb_v2: rename device_init/device_exit to probe/disconnect
Browse files Browse the repository at this point in the history
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent a177c72 commit 6b8c8c4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions drivers/media/dvb/dvb-usb/dvb_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 4 additions & 5 deletions drivers/media/dvb/dvb-usb/dvb_usb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand All @@ -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>");
Expand Down

0 comments on commit 6b8c8c4

Please sign in to comment.