Skip to content

Commit

Permalink
tipc: change tipc_net_start routine return value type
Browse files Browse the repository at this point in the history
Since now tipc_net_start() always returns a success code - 0, its
return value type should be changed from integer to void, which can
avoid unnecessary check for its return value.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ying Xue authored and David S. Miller committed Aug 20, 2012
1 parent 3812943 commit 379c045
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions net/tipc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,8 @@ int tipc_core_start_net(unsigned long addr)
{
int res;

res = tipc_net_start(addr);
if (!res)
res = tipc_eth_media_start();
tipc_net_start(addr);
res = tipc_eth_media_start();
if (res)
tipc_core_stop_net();
return res;
Expand Down
3 changes: 1 addition & 2 deletions net/tipc/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void tipc_net_route_msg(struct sk_buff *buf)
tipc_link_send(buf, dnode, msg_link_selector(msg));
}

int tipc_net_start(u32 addr)
void tipc_net_start(u32 addr)
{
char addr_string[16];

Expand All @@ -187,7 +187,6 @@ int tipc_net_start(u32 addr)
pr_info("Started in network mode\n");
pr_info("Own node address %s, network identity %u\n",
tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id);
return 0;
}

void tipc_net_stop(void)
Expand Down
2 changes: 1 addition & 1 deletion net/tipc/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extern rwlock_t tipc_net_lock;

void tipc_net_route_msg(struct sk_buff *buf);

int tipc_net_start(u32 addr);
void tipc_net_start(u32 addr);
void tipc_net_stop(void);

#endif

0 comments on commit 379c045

Please sign in to comment.