---

yaml --- r: 228381 b: refs/heads/master c: dab56ff h: refs/heads/master i: 228379: 4a6ec84 v: v3
git-mirror · Dec 16, 2010 · ba78e91 · ba78e91
1 parent b1debc5
commit ba78e91
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c3d90921604951e306a898669c46a88578c5848
+refs/heads/master: dab56ffe9acc59a6cbe8f857a95adf75f42970b9
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
@@ -201,7 +201,7 @@ static struct notifier_block ft1000_netdev_notifier = {
 };
 
 
-int ft1000InitProc(struct net_device *dev)
+int ft1000_init_proc(struct net_device *dev)
 {
 	struct ft1000_info *info;
 	struct proc_dir_entry *ft1000_proc_file;
@@ -243,7 +243,7 @@ int ft1000InitProc(struct net_device *dev)
 	return ret;
 }
 
-void ft1000CleanupProc(struct ft1000_info *info)
+void ft1000_cleanup_proc(struct ft1000_info *info)
 {
 	remove_proc_entry(info->netdevname, info->ft1000_proc_dir);
 	remove_proc_entry(FT1000_PROC_DIR, FTNET_PROC);

diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -198,7 +198,7 @@ static int ft1000_probe(struct usb_interface *interface,
 	if (ret)
 		goto err_thread;
 
-	ret = ft1000InitProc(ft1000dev->net);
+	ret = ft1000_init_proc(ft1000dev->net);
 	if (ret)
 		goto err_proc;
 
@@ -228,7 +228,7 @@ static void ft1000_disconnect(struct usb_interface *interface)
 	DEBUG("In disconnect pft1000info=%p\n", pft1000info);
 
 	if (pft1000info) {
-		ft1000CleanupProc(pft1000info);
+		ft1000_cleanup_proc(pft1000info);
 		if (pft1000info->pPollThread)
 			kthread_stop(pft1000info->pPollThread);
 

diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -594,8 +594,8 @@ struct usb_interface;
 int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf);
 int ft1000_poll(void* dev_id);
 
-int ft1000InitProc(struct net_device *dev);
-void ft1000CleanupProc(struct ft1000_info *info);
+int ft1000_init_proc(struct net_device *dev);
+void ft1000_cleanup_proc(struct ft1000_info *info);