Skip to content

Commit

Permalink
bonding: change bond_create_proc_entry() to return void
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas de Pesloüan authored and David S. Miller committed Oct 13, 2009
1 parent c634263 commit 38fc002
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3375,7 +3375,7 @@ static const struct file_operations bond_info_fops = {
.release = seq_release,
};

static int bond_create_proc_entry(struct bonding *bond)
static void bond_create_proc_entry(struct bonding *bond)
{
struct net_device *bond_dev = bond->dev;

Expand All @@ -3390,8 +3390,6 @@ static int bond_create_proc_entry(struct bonding *bond)
else
memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
}

return 0;
}

static void bond_remove_proc_entry(struct bonding *bond)
Expand Down Expand Up @@ -3430,7 +3428,7 @@ static void bond_destroy_proc_dir(void)

#else /* !CONFIG_PROC_FS */

static int bond_create_proc_entry(struct bonding *bond)
static void bond_create_proc_entry(struct bonding *bond)
{
}

Expand Down

0 comments on commit 38fc002

Please sign in to comment.