Skip to contentSkip to conversation

staging: ft1000: remove procfs entries

PATCH New Nicolas Thery 1 participant 1 message Jul 27, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: ft1000: remove procfs entries

This patch started as a fix to some checkpatch complaints in ft1000 procfs code but Greg suggested to remove the procfs entries altogether:

http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2014-July/055594.html

---
 drivers/staging/ft1000/ft1000-pcmcia/Makefile      |   3 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   2 -
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |   4 -
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 211 ------------------
 drivers/staging/ft1000/ft1000-usb/Makefile         |   2 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c    | 241 ---------------------
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |   8 -
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |   3 -
 drivers/staging/ft1000/ft1000.h                    |   2 -
 9 files changed, 2 insertions(+), 474 deletions(-)
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
drivers/staging/ft1000/ft1000-pcmcia/Makefile +1 -2
index 660b7a5..715de3f 100644
@@ -1,3 +1,2 @@
 obj-$(CONFIG_FT1000_PCMCIA) = ft1000_pcmcia.o
-ft1000_pcmcia-y := ft1000_hw.o ft1000_dnld.o ft1000_proc.o ft1000_cs.o
-
+ft1000_pcmcia-y := ft1000_hw.o ft1000_dnld.o ft1000_cs.o
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h +0 -2
index 0c21ac6..1d52738 100644
@@ -47,8 +47,6 @@ extern struct net_device *init_ft1000_card(struct pcmcia_device *link,
 extern void stop_ft1000_card(struct net_device *dev);
 extern int card_download(struct net_device *dev, const u8 *pFileStart,
 			 size_t FileLength);
-extern void ft1000InitProc(struct net_device *dev);
-extern void ft1000CleanupProc(struct net_device *dev);
 
 extern u16 ft1000_read_dpram(struct net_device *dev, int offset);
 extern void card_bootload(struct net_device *dev);
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +0 -4
index a6158be..21f09fe 100644
@@ -19,8 +19,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/proc_fs.h>
-
 #include <linux/sched.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
@@ -2102,7 +2100,6 @@ void stop_ft1000_card(struct net_device *dev)
 	release_region(dev->base_addr,256);
 	release_firmware(fw_entry);
 	flarion_ft1000_cnt--;
-	ft1000CleanupProc(dev);
 
 }
 
@@ -2247,7 +2244,6 @@ struct net_device *init_ft1000_card(struct pcmcia_device *link,
 
 	ft1000_enable_interrupts(dev);
 
-	ft1000InitProc(dev);
 	ft1000_card_present = 1;
 	dev->ethtool_ops = &ops;
 	printk(KERN_INFO "ft1000: %s: addr 0x%04lx irq %d, MAC addr %pM\n",
drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c deleted +0 -211

211 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/Makefile +1 -1
index f0f5240..7c4b784 100644
@@ -1,3 +1,3 @@
 obj-$(CONFIG_FT1000_USB) += ft1000.o
 
-ft1000-y := ft1000_debug.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_usb.o
drivers/staging/ft1000/ft1000-usb/ft1000_proc.c deleted +0 -241

241 lines not on this page · raw message

drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +0 -8
index 0a2544c..cc740c9 100644
@@ -196,17 +196,10 @@ static int ft1000_probe(struct usb_interface *interface,
 	if (ret)
 		goto err_thread;
 
-	ret = ft1000_init_proc(ft1000dev->net);
-	if (ret)
-		goto err_proc;
-
 	ft1000dev->NetDevRegDone = 1;
 
 	return 0;
 
-err_proc:
-	unregister_netdev(ft1000dev->net);
-	free_netdev(ft1000dev->net);
 err_thread:
 	kthread_stop(ft1000dev->pPollThread);
 err_load:
@@ -230,7 +223,6 @@ static void ft1000_disconnect(struct usb_interface *interface)
 
 	if (pft1000info) {
 		ft1000dev = pft1000info->priv;
-		ft1000_cleanup_proc(pft1000info);
 		if (ft1000dev->pPollThread)
 			kthread_stop(ft1000dev->pPollThread);
 
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h +0 -3
index 464e5ab..8f7ccae 100644
@@ -149,7 +149,4 @@ int reg_ft1000_netdev(struct ft1000_usb *ft1000dev,
 		      struct usb_interface *intf);
 int ft1000_poll(void *dev_id);
 
-int ft1000_init_proc(struct net_device *dev);
-void ft1000_cleanup_proc(struct ft1000_info *info);
-
 #endif  /* _FT1000_USB_H_ */
drivers/staging/ft1000/ft1000.h +0 -2
index db57430..8a2e4ca 100644
@@ -363,6 +363,4 @@ struct ft1000_info {
 		u16 Rec[MAX_DSP_SESS_REC];
 		u32 MagRec[MAX_DSP_SESS_REC/2];
 	} DSPSess;
-	struct proc_dir_entry *ft1000_proc_dir;
-	char netdevname[IFNAMSIZ];
 };
Signature · 1 line
1.9.1