aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2010-12-14 03:42:27 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-16 15:18:25 -0500
commitdab56ffe9acc59a6cbe8f857a95adf75f42970b9 (patch)
tree06d0c12d1e29ab39073b0e51e14b21fcf6511ea3
parent8c3d90921604951e306a898669c46a88578c5848 (diff)
staging: ft1000: Fix camelcase function names.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_proc.c4
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.c4
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
index 0f271c281b8..b87542abbe8 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
@@ -201,7 +201,7 @@ static struct notifier_block ft1000_netdev_notifier = {
201}; 201};
202 202
203 203
204int ft1000InitProc(struct net_device *dev) 204int ft1000_init_proc(struct net_device *dev)
205{ 205{
206 struct ft1000_info *info; 206 struct ft1000_info *info;
207 struct proc_dir_entry *ft1000_proc_file; 207 struct proc_dir_entry *ft1000_proc_file;
@@ -243,7 +243,7 @@ fail:
243 return ret; 243 return ret;
244} 244}
245 245
246void ft1000CleanupProc(struct ft1000_info *info) 246void ft1000_cleanup_proc(struct ft1000_info *info)
247{ 247{
248 remove_proc_entry(info->netdevname, info->ft1000_proc_dir); 248 remove_proc_entry(info->netdevname, info->ft1000_proc_dir);
249 remove_proc_entry(FT1000_PROC_DIR, FTNET_PROC); 249 remove_proc_entry(FT1000_PROC_DIR, FTNET_PROC);
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index 0e1fc3f1e05..79482ac1c48 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -198,7 +198,7 @@ static int ft1000_probe(struct usb_interface *interface,
198 if (ret) 198 if (ret)
199 goto err_thread; 199 goto err_thread;
200 200
201 ret = ft1000InitProc(ft1000dev->net); 201 ret = ft1000_init_proc(ft1000dev->net);
202 if (ret) 202 if (ret)
203 goto err_proc; 203 goto err_proc;
204 204
@@ -228,7 +228,7 @@ static void ft1000_disconnect(struct usb_interface *interface)
228 DEBUG("In disconnect pft1000info=%p\n", pft1000info); 228 DEBUG("In disconnect pft1000info=%p\n", pft1000info);
229 229
230 if (pft1000info) { 230 if (pft1000info) {
231 ft1000CleanupProc(pft1000info); 231 ft1000_cleanup_proc(pft1000info);
232 if (pft1000info->pPollThread) 232 if (pft1000info->pPollThread)
233 kthread_stop(pft1000info->pPollThread); 233 kthread_stop(pft1000info->pPollThread);
234 234
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 4a91469e64f..a143e9ca4f0 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -594,8 +594,8 @@ struct usb_interface;
594int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf); 594int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf);
595int ft1000_poll(void* dev_id); 595int ft1000_poll(void* dev_id);
596 596
597int ft1000InitProc(struct net_device *dev); 597int ft1000_init_proc(struct net_device *dev);
598void ft1000CleanupProc(struct ft1000_info *info); 598void ft1000_cleanup_proc(struct ft1000_info *info);
599 599
600 600
601 601