aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas de Pesloüan <nicolas.2p.debian@free.fr>2009-10-13 03:45:06 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-13 03:45:06 -0400
commit38fc0026da255aa328c3730a1c4d28b4e11e6a2b (patch)
treec8da3b33e6f62107ecbde43f33f724ae1cf5a7bb
parentc634263df5890daafe0ea470faee3305736bbc3d (diff)
bonding: change bond_create_proc_entry() to return void
The function bond_create_proc_entry is currently of type int. Two versions of this function exist: The one in the ifdef CONFIG_PROC_FS branch always return 0. The one in the else branch (which is empty) return nothing. When CONFIG_PROC_FS is undef, this cause the following warning: drivers/net/bonding/bond_main.c: In function `bond_create_proc_entry': drivers/net/bonding/bond_main.c:3393: warning: control reaches end of non-void function No caller of this function use the returned value. So change the returned type from int to void and remove the useless return 0; . Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr> Reported-by: Rakib Mullick <rakib.mullick@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index ef6af1cb7d39..feb03ad0d803 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3375,7 +3375,7 @@ static const struct file_operations bond_info_fops = {
3375 .release = seq_release, 3375 .release = seq_release,
3376}; 3376};
3377 3377
3378static int bond_create_proc_entry(struct bonding *bond) 3378static void bond_create_proc_entry(struct bonding *bond)
3379{ 3379{
3380 struct net_device *bond_dev = bond->dev; 3380 struct net_device *bond_dev = bond->dev;
3381 3381
@@ -3390,8 +3390,6 @@ static int bond_create_proc_entry(struct bonding *bond)
3390 else 3390 else
3391 memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ); 3391 memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
3392 } 3392 }
3393
3394 return 0;
3395} 3393}
3396 3394
3397static void bond_remove_proc_entry(struct bonding *bond) 3395static void bond_remove_proc_entry(struct bonding *bond)
@@ -3430,7 +3428,7 @@ static void bond_destroy_proc_dir(void)
3430 3428
3431#else /* !CONFIG_PROC_FS */ 3429#else /* !CONFIG_PROC_FS */
3432 3430
3433static int bond_create_proc_entry(struct bonding *bond) 3431static void bond_create_proc_entry(struct bonding *bond)
3434{ 3432{
3435} 3433}
3436 3434