Skip to contentSkip to conversation

staging: silicom: Add appropriate ifdef conditions in bpctl_mod.c

PATCH In review Daeseok Youn 2 participants 3 messages Apr 7, 2014 – Apr 26, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: silicom: Add appropriate ifdef conditions in bpctl_mod.c

The bp_proc_create() can be called if BP_PROC_SUPPORT is defined.

---
 drivers/staging/silicom/bpctl_mod.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/staging/silicom/bpctl_mod.c +5 -0
index 6b9365b..5a3d758 100644
@@ -119,7 +119,10 @@ 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);
+
+#ifdef BP_PROC_SUPPORT
 static int bp_proc_create(void);
+#endif
 
 static int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
 static int get_dev_idx_bsf(int bus, int slot, int func);
@@ -6783,6 +6786,7 @@ EXPORT_SYMBOL(bp_if_scan_sd);
 
 static struct proc_dir_entry *bp_procfs_dir;
 
+#ifdef BP_PROC_SUPPORT
 static int bp_proc_create(void)
 {
 	bp_procfs_dir = proc_mkdir(BP_PROC_DIR, init_net.proc_net);
@@ -6794,6 +6798,7 @@ static int bp_proc_create(void)
 	}
 	return 0;
 }
+#endif
 
 static int procfs_add(char *proc_name, const struct file_operations *fops,
 		      struct bpctl_dev *dev)
Signature · 1 line
1.7.4.4
maintainer
#1 lore raw
Quoted 13 lines · Daeseok Youn

The bp_proc_create() can be called if BP_PROC_SUPPORT is defined.

---
 drivers/staging/silicom/bpctl_mod.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/staging/silicom/bpctl_mod.c +0 -0
index 6b9365b..5a3d758 100644

drivers/staging/silicom/bpctl_mod.c static void if_scan_init(void); · line 125

Quoted 7 lines
drivers/staging/silicom/bpctl_mod.c +3 -0
@@ -119,7 +119,10 @@ 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);
+
+#ifdef BP_PROC_SUPPORT
 static int bp_proc_create(void);
+#endif

No, this code should just be removed, right?

#2 lore raw

2014-04-26 7:33 GMT+09:00, Greg KH <[email protected]>:

Quoted 16 lines · Daeseok Youn
Quoted 15 lines

The bp_proc_create() can be called if BP_PROC_SUPPORT is defined.

---
 drivers/staging/silicom/bpctl_mod.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/staging/silicom/bpctl_mod.c +0 -0
index 6b9365b..5a3d758 100644
@@ -119,7 +119,10 @@ static void if_scan_init(void);
 
Quoted 10 lines

drivers/staging/silicom/bpctl_mod.c static void if_scan_init(void); · line 125

Quoted 8 lines
drivers/staging/silicom/bpctl_mod.c +3 -0
 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);
+
+#ifdef BP_PROC_SUPPORT
 static int bp_proc_create(void);
+#endif

No, this code should just be removed, right?

Yes, someone sent a patch for this.

Regards,
Daeseok Youn

Quoted 2 lines