This is a note to let you know that I've just added the patch titled
drivers:staging:silicom Fixed extern warnings reported by checkpatch
to my staging git tree which can be found at
git://
git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.gitin the staging-next branch.
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
The patch will also be merged in the next major kernel release
during the merge window.
If you have any questions about this process, please let me know.
From 4624b5433f063a56032f959e7a6d72
d8e6e735b6 Mon Sep 17 00:00:00 2001
From: Surendra Patil <
surendra.tux@gmail.com>
Date: Tue, 11 Feb 2014 23:57:22 -0800
Subject: drivers:staging:silicom Fixed extern warnings reported by checkpatch
1) Deleted bp_proc_create() declaration from bp_mod.h,
because it is declared as static in bpctl_mod.c and not used anywhere.
2) checkpatch warns about
WARNING: externs should be avoided in .c files
because we have function declarations in bptcl_mod.c,These
functions are not used anywhere else so made them static.
Signed-off-by: Surendra Patil <
surendra.tux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <
gregkh@linuxfoundation.org>
---
drivers/staging/silicom/bp_
mod.h | 2 --
drivers/staging/silicom/bpctl_
mod.c | 20 ++++++++++----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/silicom/bp_
mod.h b/drivers/staging/silicom/bp_
mod.h
index 8154a7bf050f..9999e6eb03a4 100644
--- a/drivers/staging/silicom/bp_
mod.h
+++ b/drivers/staging/silicom/bp_
mod.h
@@ -698,5 +698,3 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j)
readl((void *)((a)->mem_map) + BP10GB_##reg))
#endif
-
-int bp_proc_create(void);
diff --git a/drivers/staging/silicom/
bpctl_mod.c b/drivers/staging/silicom/
bpctl_mod.c
index 00b3c5157ea1..f4aea92133c8 100644
--- a/drivers/staging/silicom/
bpctl_mod.c
+++ b/drivers/staging/silicom/
bpctl_mod.c
@@ -117,12 +117,12 @@ static int wdt_timer(struct bpctl_dev *pbpctl_dev, int *time_left);
static struct bpctl_dev *get_status_port_fn(struct bpctl_dev *pbpctl_dev);
static void if_scan_init(void);
-int bypass_proc_create_dev_sd(
struct bpctl_dev *pbp_device_block);
-int bypass_proc_remove_dev_sd(
struct bpctl_dev *pbp_device_block);
-int bp_proc_create(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);
-int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
-int get_dev_idx_bsf(int bus, int slot, int func);
+static int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
+static int get_dev_idx_bsf(int bus, int slot, int func);
static int bp_get_dev_idx_bsf(struct net_device *dev, int *index)
{
@@ -262,7 +262,7 @@ static struct notifier_block bp_notifier_block = {
.notifier_call = bp_device_event,
};
-int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
+static int is_bypass_fn(struct bpctl_dev *pbpctl_dev);
int wdt_time_left(struct bpctl_dev *pbpctl_dev);
static void write_pulse(struct bpctl_dev *pbpctl_dev,
@@ -4906,7 +4906,7 @@ static int get_bypass_info_fn(struct bpctl_dev *pbpctl_dev, char *dev_name,
return 0;
}
-int get_dev_idx_bsf(int bus, int slot, int func)
+static int get_dev_idx_bsf(int bus, int slot, int func)
{
int idx_dev = 0;
for (idx_dev = 0;
@@ -6786,7 +6786,7 @@ EXPORT_SYMBOL(bp_if_scan_sd);
static struct proc_dir_entry *bp_procfs_dir;
-int bp_proc_create(void)
+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) {
@@ -7414,7 +7414,7 @@ static int show_wd_autoreset(struct seq_file *m, void *v)
}
RW_FOPS(wd_autoreset)
-int bypass_proc_create_dev_sd(
struct bpctl_dev *pbp_device_block)
+static int bypass_proc_create_dev_sd(
struct bpctl_dev *pbp_device_block)
{
struct bypass_pfs_sd *current_pfs = &(pbp_device_block->bypass_
pfs_set);
static struct proc_dir_entry *procfs_dir;
@@ -7484,7 +7484,7 @@ int bypass_proc_create_dev_sd(
struct bpctl_dev *pbp_device_block)
return ret;
}
-int bypass_proc_remove_dev_sd(
struct bpctl_dev *pbp_device_block)
+static int bypass_proc_remove_dev_sd(
struct bpctl_dev *pbp_device_block)
{
struct bypass_pfs_sd *current_pfs = &pbp_device_block->bypass_pfs_
set;
--
1.8.5.1.163.gd7aced9
Comments