2010-12-14 08:40:10

by Marek Belisko

Subject: [PATCH 1/2] staging: ft1000: Fix camelcase function names.

Signed-off-by: Marek Belisko <[email protected]>
---
drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 4 ++--
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 4 ++--
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 4 ++--
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 0f271c2..b87542a 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 = {
};


-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 @@ fail:
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/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index 0e1fc3f..79482ac 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,
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/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 4a91469..a143e9c 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;
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);



--
1.7.1

2010-12-14 08:40:24

by Marek Belisko

Subject: [PATCH 2/2] staging: ft1000: Rename ft1000_chdev.c to ft1000_debug.c.

Name of old file was misleading because it is currently
updated to debugfs so change also file name.

Signed-off-by: Marek Belisko <[email protected]>
---
drivers/staging/ft1000/ft1000-usb/Makefile | 2 +-
.../ft1000-usb/{ft1000_chdev.c => ft1000_debug.c} | 0
2 files changed, 1 insertions(+), 1 deletions(-)
rename drivers/staging/ft1000/ft1000-usb/{ft1000_chdev.c => ft1000_debug.c} (100%)

diff --git a/drivers/staging/ft1000/ft1000-usb/Makefile b/drivers/staging/ft1000/ft1000-usb/Makefile
index dd87ecd..f0f5240 100644
--- a/drivers/staging/ft1000/ft1000-usb/Makefile
+++ b/drivers/staging/ft1000/ft1000-usb/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_FT1000_USB) += ft1000.o

-ft1000-y := ft1000_chdev.o ft1000_download.o ft1000_hw.o ft1000_proc.o ft1000_usb.o
+ft1000-y := ft1000_debug.o ft1000_download.o ft1000_hw.o ft1000_proc.o ft1000_usb.o
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
similarity index 100%
rename from drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
rename to drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
--
1.7.1