* [PATCH] drivers: staging: removing never #def'd BP_PROC_SUPPORT
@ 2014-04-07 11:00 Jan Moskyto Matejka
2014-05-23 7:35 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Jan Moskyto Matejka @ 2014-04-07 11:00 UTC (permalink / raw)
To: linux-kernel, linux-next, Greg Kroah-Hartman; +Cc: Jan Moskyto Matejka
BP_PROC_SUPPORT was never defined so removing all the #ifdef'd code
including the bp_proc_create() function.
Signed-off-by: Jan Moskyto Matejka <mq@suse.cz>
---
drivers/staging/silicom/bpctl_mod.c | 39 -------------------------------------
1 file changed, 39 deletions(-)
diff --git a/drivers/staging/silicom/bpctl_mod.c b/drivers/staging/silicom/bpctl_mod.c
index 6b9365b..530d621 100644
--- a/drivers/staging/silicom/bpctl_mod.c
+++ b/drivers/staging/silicom/bpctl_mod.c
@@ -119,7 +119,6 @@ static void if_scan_init(void);
static int bypass_proc_create_dev_sd(struct bpctl_dev *pbp_device_block);
static int bypass_proc_remove_dev_sd(struct bpctl_dev *pbp_device_block);
-static int bp_proc_create(void);
static int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
static int get_dev_idx_bsf(int bus, int slot, int func);
@@ -6399,25 +6398,6 @@ static int __init bypass_init_module(void)
}
register_netdevice_notifier(&bp_notifier_block);
-#ifdef BP_PROC_SUPPORT
- {
- int i = 0;
- /* unsigned long flags; */
- /* rcu_read_lock(); */
- bp_proc_create();
- for (i = 0; i < device_num; i++) {
- if (bpctl_dev_arr[i].ifindex) {
- /* spin_lock_irqsave(&bpvm_lock, flags); */
- bypass_proc_remove_dev_sd(&bpctl_dev_arr[i]);
- bypass_proc_create_dev_sd(&bpctl_dev_arr[i]);
- /* spin_unlock_irqrestore(&bpvm_lock, flags); */
- }
-
- }
- /* rcu_read_unlock(); */
- }
-#endif
-
return 0;
}
@@ -6431,13 +6411,6 @@ static void __exit bypass_cleanup_module(void)
for (i = 0; i < device_num; i++) {
/* unsigned long flags; */
-#ifdef BP_PROC_SUPPORT
-/* spin_lock_irqsave(&bpvm_lock, flags);
- rcu_read_lock(); */
- bypass_proc_remove_dev_sd(&bpctl_dev_arr[i]);
-/* spin_unlock_irqrestore(&bpvm_lock, flags);
- rcu_read_unlock(); */
-#endif
remove_bypass_wd_auto(&bpctl_dev_arr[i]);
bpctl_dev_arr[i].reset_time = 0;
@@ -6783,18 +6756,6 @@ EXPORT_SYMBOL(bp_if_scan_sd);
static struct proc_dir_entry *bp_procfs_dir;
-static int bp_proc_create(void)
-{
- bp_procfs_dir = proc_mkdir(BP_PROC_DIR, init_net.proc_net);
- if (bp_procfs_dir == (struct proc_dir_entry *)0) {
- printk(KERN_DEBUG
- "Could not create procfs nicinfo directory %s\n",
- BP_PROC_DIR);
- return -1;
- }
- return 0;
-}
-
static int procfs_add(char *proc_name, const struct file_operations *fops,
struct bpctl_dev *dev)
{
--
1.8.4.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers: staging: removing never #def'd BP_PROC_SUPPORT
2014-04-07 11:00 [PATCH] drivers: staging: removing never #def'd BP_PROC_SUPPORT Jan Moskyto Matejka
@ 2014-05-23 7:35 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2014-05-23 7:35 UTC (permalink / raw)
To: Jan Moskyto Matejka; +Cc: linux-kernel, linux-next
On Mon, Apr 07, 2014 at 01:00:57PM +0200, Jan Moskyto Matejka wrote:
> BP_PROC_SUPPORT was never defined so removing all the #ifdef'd code
> including the bp_proc_create() function.
>
> Signed-off-by: Jan Moskyto Matejka <mq@suse.cz>
> ---
> drivers/staging/silicom/bpctl_mod.c | 39 -------------------------------------
> 1 file changed, 39 deletions(-)
Someone sent this same patch before you did, sorry :(
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-23 7:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-07 11:00 [PATCH] drivers: staging: removing never #def'd BP_PROC_SUPPORT Jan Moskyto Matejka
2014-05-23 7:35 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).