From 41a1b398bf97d389f4542666b8498f4c45121060 Mon Sep 17 00:00:00 2001
From: "Bc. Jan Kriz" <devel@jojen.net>
Date: Tue, 22 Mar 2011 10:21:57 +0100
Subject: [PATCH] Hotplug device support functions renamed

---
 lincan/include/main.h |  4 ++--
 lincan/src/main.c     | 10 ++--------
 lincan/src/usbcan.c   |  6 +++---
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/lincan/include/main.h b/lincan/include/main.h
index 30713f6..152af5c 100644
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -538,5 +538,5 @@ void can_filltimestamp(canmsg_tstamp_t *ptimestamp)
 extern int can_rtl_priority;
 #endif /*CAN_WITH_RTL*/
 
-extern struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *chip,void *data));
-extern void cleanup_usbdev(struct candevice_t *dev);
+extern struct candevice_t* register_hotplug_dev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *chip,void *data));
+extern void cleanup_hotplug_dev(struct candevice_t *dev);
diff --git a/lincan/src/main.c b/lincan/src/main.c
index 197f37f..c364895 100644
--- a/lincan/src/main.c
+++ b/lincan/src/main.c
@@ -442,7 +442,7 @@ int init_module(void)
 
 
 
-struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *ch,void *data)){
+struct candevice_t* register_hotplug_dev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *ch,void *data)){
 	int i=0, j, board=0;
 	struct candevice_t *candev;
 	struct canchip_t *chip;
@@ -590,13 +590,7 @@ struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chip
 		return NULL;
 }
 
-
-
-
-
-
-
-void cleanup_usbdev(struct candevice_t *dev)
+void cleanup_hotplug_dev(struct candevice_t *dev)
 {
 	int i=0;
 	int dev_minor;
diff --git a/lincan/src/usbcan.c b/lincan/src/usbcan.c
index 429167c..4492f61 100644
--- a/lincan/src/usbcan.c
+++ b/lincan/src/usbcan.c
@@ -1459,7 +1459,7 @@ static int usbcan_probe(struct usb_interface *interface, const struct usb_device
 	/* save our data pointer in this interface device */
 	usb_set_intfdata(interface, usbdevs);
 
-	if (!(usbdevs->candev=register_usbdev("usbcan",(void *) usbdevs, usbcan_register_devs)))
+	if (!(usbdevs->candev=register_hotplug_dev("usbcan",(void *) usbdevs, usbcan_register_devs)))
 		goto register_error;
 
 	/* let the user know what node this device is now attached to */
@@ -1467,7 +1467,7 @@ static int usbcan_probe(struct usb_interface *interface, const struct usb_device
 	return 0;
 
 register_error:
-	cleanup_usbdev(usbdevs->candev);
+	cleanup_hotplug_dev(usbdevs->candev);
 error:
 	if (usbdevs){
 		if (usbdevs->devs){
@@ -1507,7 +1507,7 @@ static void usbcan_disconnect(struct usb_interface *interface)
 	if (usbdevs->devs){
 		usb_put_dev((*usbdevs->devs)->udev);
 	}
-	cleanup_usbdev(usbdevs->candev);
+	cleanup_hotplug_dev(usbdevs->candev);
 	if (usbdevs->devs){
 		for (j=0;j<usbdevs->count;j++){
 			if (!usbdevs->devs[j])	continue;
-- 
2.39.2