net: return operator cleanup
Change "return (EXPR);" to "return EXPR;" return is not a function, parentheses are not required. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
6a08d194ee
commit
a02cec2155
@@ -89,7 +89,7 @@ int tipc_addr_domain_valid(u32 addr)
|
||||
|
||||
int tipc_addr_node_valid(u32 addr)
|
||||
{
|
||||
return (tipc_addr_domain_valid(addr) && tipc_node(addr));
|
||||
return tipc_addr_domain_valid(addr) && tipc_node(addr);
|
||||
}
|
||||
|
||||
int tipc_in_scope(u32 domain, u32 addr)
|
||||
|
@@ -184,7 +184,7 @@ static void bclink_set_gap(struct tipc_node *n_ptr)
|
||||
|
||||
static int bclink_ack_allowed(u32 n)
|
||||
{
|
||||
return((n % TIPC_MIN_LINK_WIN) == tipc_own_tag);
|
||||
return (n % TIPC_MIN_LINK_WIN) == tipc_own_tag;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -63,7 +63,7 @@ static int media_name_valid(const char *name)
|
||||
len = strlen(name);
|
||||
if ((len + 1) > TIPC_MAX_MEDIA_NAME)
|
||||
return 0;
|
||||
return (strspn(name, tipc_alphabet) == len);
|
||||
return strspn(name, tipc_alphabet) == len;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -134,7 +134,7 @@ void tipc_printbuf_reset(struct print_buf *pb)
|
||||
|
||||
int tipc_printbuf_empty(struct print_buf *pb)
|
||||
{
|
||||
return (!pb->buf || (pb->crs == pb->buf));
|
||||
return !pb->buf || (pb->crs == pb->buf);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -169,7 +169,7 @@ int tipc_printbuf_validate(struct print_buf *pb)
|
||||
tipc_printf(pb, err);
|
||||
}
|
||||
}
|
||||
return (pb->crs - pb->buf + 1);
|
||||
return pb->crs - pb->buf + 1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -239,13 +239,13 @@ int tipc_link_is_up(struct link *l_ptr)
|
||||
{
|
||||
if (!l_ptr)
|
||||
return 0;
|
||||
return (link_working_working(l_ptr) || link_working_unknown(l_ptr));
|
||||
return link_working_working(l_ptr) || link_working_unknown(l_ptr);
|
||||
}
|
||||
|
||||
int tipc_link_is_active(struct link *l_ptr)
|
||||
{
|
||||
return ((l_ptr->owner->active_links[0] == l_ptr) ||
|
||||
(l_ptr->owner->active_links[1] == l_ptr));
|
||||
return (l_ptr->owner->active_links[0] == l_ptr) ||
|
||||
(l_ptr->owner->active_links[1] == l_ptr);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -279,12 +279,12 @@ static inline int between(u32 lower, u32 upper, u32 n)
|
||||
|
||||
static inline int less_eq(u32 left, u32 right)
|
||||
{
|
||||
return (mod(right - left) < 32768u);
|
||||
return mod(right - left) < 32768u;
|
||||
}
|
||||
|
||||
static inline int less(u32 left, u32 right)
|
||||
{
|
||||
return (less_eq(left, right) && (mod(right) != mod(left)));
|
||||
return less_eq(left, right) && (mod(right) != mod(left));
|
||||
}
|
||||
|
||||
static inline u32 lesser(u32 left, u32 right)
|
||||
@@ -299,32 +299,32 @@ static inline u32 lesser(u32 left, u32 right)
|
||||
|
||||
static inline int link_working_working(struct link *l_ptr)
|
||||
{
|
||||
return (l_ptr->state == WORKING_WORKING);
|
||||
return l_ptr->state == WORKING_WORKING;
|
||||
}
|
||||
|
||||
static inline int link_working_unknown(struct link *l_ptr)
|
||||
{
|
||||
return (l_ptr->state == WORKING_UNKNOWN);
|
||||
return l_ptr->state == WORKING_UNKNOWN;
|
||||
}
|
||||
|
||||
static inline int link_reset_unknown(struct link *l_ptr)
|
||||
{
|
||||
return (l_ptr->state == RESET_UNKNOWN);
|
||||
return l_ptr->state == RESET_UNKNOWN;
|
||||
}
|
||||
|
||||
static inline int link_reset_reset(struct link *l_ptr)
|
||||
{
|
||||
return (l_ptr->state == RESET_RESET);
|
||||
return l_ptr->state == RESET_RESET;
|
||||
}
|
||||
|
||||
static inline int link_blocked(struct link *l_ptr)
|
||||
{
|
||||
return (l_ptr->exp_msg_count || l_ptr->blocked);
|
||||
return l_ptr->exp_msg_count || l_ptr->blocked;
|
||||
}
|
||||
|
||||
static inline int link_congested(struct link *l_ptr)
|
||||
{
|
||||
return (l_ptr->out_queue_size >= l_ptr->queue_limit[0]);
|
||||
return l_ptr->out_queue_size >= l_ptr->queue_limit[0];
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@@ -104,7 +104,7 @@ static inline u32 msg_user(struct tipc_msg *m)
|
||||
|
||||
static inline u32 msg_isdata(struct tipc_msg *m)
|
||||
{
|
||||
return (msg_user(m) <= TIPC_CRITICAL_IMPORTANCE);
|
||||
return msg_user(m) <= TIPC_CRITICAL_IMPORTANCE;
|
||||
}
|
||||
|
||||
static inline void msg_set_user(struct tipc_msg *m, u32 n)
|
||||
@@ -289,7 +289,7 @@ static inline void msg_set_destnode(struct tipc_msg *m, u32 a)
|
||||
|
||||
static inline int msg_is_dest(struct tipc_msg *m, u32 d)
|
||||
{
|
||||
return(msg_short(m) || (msg_destnode(m) == d));
|
||||
return msg_short(m) || (msg_destnode(m) == d);
|
||||
}
|
||||
|
||||
static inline u32 msg_routed(struct tipc_msg *m)
|
||||
@@ -632,7 +632,7 @@ static inline void msg_set_bcast_tag(struct tipc_msg *m, u32 n)
|
||||
|
||||
static inline u32 msg_max_pkt(struct tipc_msg *m)
|
||||
{
|
||||
return (msg_bits(m, 9, 16, 0xffff) * 4);
|
||||
return msg_bits(m, 9, 16, 0xffff) * 4;
|
||||
}
|
||||
|
||||
static inline void msg_set_max_pkt(struct tipc_msg *m, u32 n)
|
||||
|
@@ -116,7 +116,7 @@ DEFINE_RWLOCK(tipc_nametbl_lock);
|
||||
|
||||
static int hash(int x)
|
||||
{
|
||||
return(x & (tipc_nametbl_size - 1));
|
||||
return x & (tipc_nametbl_size - 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -242,17 +242,17 @@ int tipc_node_has_active_links(struct tipc_node *n_ptr)
|
||||
|
||||
int tipc_node_has_redundant_links(struct tipc_node *n_ptr)
|
||||
{
|
||||
return (n_ptr->working_links > 1);
|
||||
return n_ptr->working_links > 1;
|
||||
}
|
||||
|
||||
static int tipc_node_has_active_routes(struct tipc_node *n_ptr)
|
||||
{
|
||||
return (n_ptr && (n_ptr->last_router >= 0));
|
||||
return n_ptr && (n_ptr->last_router >= 0);
|
||||
}
|
||||
|
||||
int tipc_node_is_up(struct tipc_node *n_ptr)
|
||||
{
|
||||
return (tipc_node_has_active_links(n_ptr) || tipc_node_has_active_routes(n_ptr));
|
||||
return tipc_node_has_active_links(n_ptr) || tipc_node_has_active_routes(n_ptr);
|
||||
}
|
||||
|
||||
struct tipc_node *tipc_node_attach_link(struct link *l_ptr)
|
||||
|
@@ -157,7 +157,7 @@ static inline u32 tipc_peer_node(struct port *p_ptr)
|
||||
|
||||
static inline int tipc_port_congested(struct port *p_ptr)
|
||||
{
|
||||
return((p_ptr->sent - p_ptr->acked) >= (TIPC_FLOW_CONTROL_WIN * 2));
|
||||
return (p_ptr->sent - p_ptr->acked) >= (TIPC_FLOW_CONTROL_WIN * 2);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -1195,7 +1195,7 @@ static int rx_queue_full(struct tipc_msg *msg, u32 queue_size, u32 base)
|
||||
if (msg_connected(msg))
|
||||
threshold *= 4;
|
||||
|
||||
return (queue_size >= threshold);
|
||||
return queue_size >= threshold;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -604,6 +604,6 @@ int tipc_ispublished(struct tipc_name const *name)
|
||||
{
|
||||
u32 domain = 0;
|
||||
|
||||
return(tipc_nametbl_translate(name->type, name->instance,&domain) != 0);
|
||||
return tipc_nametbl_translate(name->type, name->instance, &domain) != 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user