2014-04-07 03:03:48

by Daeseok Youn

Subject: [PATCH] staging: silicom: Add appropriate ifdef conditions in bpctl_mod.c

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

Signed-off-by: Daeseok Youn <[email protected]>
---
drivers/staging/silicom/bpctl_mod.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/silicom/bpctl_mod.c b/drivers/staging/silicom/bpctl_mod.c
index 6b9365b..5a3d758 100644
--- a/drivers/staging/silicom/bpctl_mod.c
+++ b/drivers/staging/silicom/bpctl_mod.c
@@ -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)
--
1.7.4.4

2014-04-25 22:31:06

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: silicom: Add appropriate ifdef conditions in bpctl_mod.c

On Mon, Apr 07, 2014 at 12:03:41PM +0900, Daeseok Youn wrote:
>
> The bp_proc_create() can be called if BP_PROC_SUPPORT is defined.
>
> Signed-off-by: Daeseok Youn <[email protected]>
> ---
> drivers/staging/silicom/bpctl_mod.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/silicom/bpctl_mod.c b/drivers/staging/silicom/bpctl_mod.c
> index 6b9365b..5a3d758 100644
> --- a/drivers/staging/silicom/bpctl_mod.c
> +++ b/drivers/staging/silicom/bpctl_mod.c
> @@ -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?

2014-04-26 00:26:46

by Daeseok Youn

Subject: Re: [PATCH] staging: silicom: Add appropriate ifdef conditions in bpctl_mod.c

2014-04-26 7:33 GMT+09:00, Greg KH <[email protected]>:
> On Mon, Apr 07, 2014 at 12:03:41PM +0900, Daeseok Youn wrote:
>>
>> The bp_proc_create() can be called if BP_PROC_SUPPORT is defined.
>>
>> Signed-off-by: Daeseok Youn <[email protected]>
>> ---
>> drivers/staging/silicom/bpctl_mod.c | 5 +++++
>> 1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/staging/silicom/bpctl_mod.c
>> b/drivers/staging/silicom/bpctl_mod.c
>> index 6b9365b..5a3d758 100644
>> --- a/drivers/staging/silicom/bpctl_mod.c
>> +++ b/drivers/staging/silicom/bpctl_mod.c
>> @@ -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?
Yes, someone sent a patch for this.

Regards,
Daeseok Youn
>
>