diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2008-07-15 01:44:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-15 01:44:01 -0400 |
commit | 0e35fd5e5264bb46d1febbe9cd9aa08421c21a96 (patch) | |
tree | 984ea14bf1e691d02b3202abeff087ba4369bc44 /net/tipc/user_reg.c | |
parent | 2da59918e26837f305131cfac9c0f1b3b42bb8ae (diff) |
tipc: Eliminate improper use of TIPC_OK error code
This patch corrects many places where TIPC routines indicated
successful completion by returning TIPC_OK instead of 0.
(The TIPC_OK symbol has the value 0, but it should only be used
in contexts that deal with the error code field of a TIPC
message header.)
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/user_reg.c')
-rw-r--r-- | net/tipc/user_reg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/user_reg.c b/net/tipc/user_reg.c index 4146c40cd20b..506928803162 100644 --- a/net/tipc/user_reg.c +++ b/net/tipc/user_reg.c | |||
@@ -91,7 +91,7 @@ static int reg_init(void) | |||
91 | } | 91 | } |
92 | } | 92 | } |
93 | spin_unlock_bh(®_lock); | 93 | spin_unlock_bh(®_lock); |
94 | return users ? TIPC_OK : -ENOMEM; | 94 | return users ? 0 : -ENOMEM; |
95 | } | 95 | } |
96 | 96 | ||
97 | /** | 97 | /** |
@@ -129,7 +129,7 @@ int tipc_reg_start(void) | |||
129 | tipc_k_signal((Handler)reg_callback, | 129 | tipc_k_signal((Handler)reg_callback, |
130 | (unsigned long)&users[u]); | 130 | (unsigned long)&users[u]); |
131 | } | 131 | } |
132 | return TIPC_OK; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | /** | 135 | /** |
@@ -184,7 +184,7 @@ int tipc_attach(u32 *userid, tipc_mode_event cb, void *usr_handle) | |||
184 | 184 | ||
185 | if (cb && (tipc_mode != TIPC_NOT_RUNNING)) | 185 | if (cb && (tipc_mode != TIPC_NOT_RUNNING)) |
186 | tipc_k_signal((Handler)reg_callback, (unsigned long)user_ptr); | 186 | tipc_k_signal((Handler)reg_callback, (unsigned long)user_ptr); |
187 | return TIPC_OK; | 187 | return 0; |
188 | } | 188 | } |
189 | 189 | ||
190 | /** | 190 | /** |
@@ -230,7 +230,7 @@ int tipc_reg_add_port(struct user_port *up_ptr) | |||
230 | struct tipc_user *user_ptr; | 230 | struct tipc_user *user_ptr; |
231 | 231 | ||
232 | if (up_ptr->user_ref == 0) | 232 | if (up_ptr->user_ref == 0) |
233 | return TIPC_OK; | 233 | return 0; |
234 | if (up_ptr->user_ref > MAX_USERID) | 234 | if (up_ptr->user_ref > MAX_USERID) |
235 | return -EINVAL; | 235 | return -EINVAL; |
236 | if ((tipc_mode == TIPC_NOT_RUNNING) || !users ) | 236 | if ((tipc_mode == TIPC_NOT_RUNNING) || !users ) |
@@ -240,7 +240,7 @@ int tipc_reg_add_port(struct user_port *up_ptr) | |||
240 | user_ptr = &users[up_ptr->user_ref]; | 240 | user_ptr = &users[up_ptr->user_ref]; |
241 | list_add(&up_ptr->uport_list, &user_ptr->ports); | 241 | list_add(&up_ptr->uport_list, &user_ptr->ports); |
242 | spin_unlock_bh(®_lock); | 242 | spin_unlock_bh(®_lock); |
243 | return TIPC_OK; | 243 | return 0; |
244 | } | 244 | } |
245 | 245 | ||
246 | /** | 246 | /** |
@@ -250,7 +250,7 @@ int tipc_reg_add_port(struct user_port *up_ptr) | |||
250 | int tipc_reg_remove_port(struct user_port *up_ptr) | 250 | int tipc_reg_remove_port(struct user_port *up_ptr) |
251 | { | 251 | { |
252 | if (up_ptr->user_ref == 0) | 252 | if (up_ptr->user_ref == 0) |
253 | return TIPC_OK; | 253 | return 0; |
254 | if (up_ptr->user_ref > MAX_USERID) | 254 | if (up_ptr->user_ref > MAX_USERID) |
255 | return -EINVAL; | 255 | return -EINVAL; |
256 | if (!users ) | 256 | if (!users ) |
@@ -259,6 +259,6 @@ int tipc_reg_remove_port(struct user_port *up_ptr) | |||
259 | spin_lock_bh(®_lock); | 259 | spin_lock_bh(®_lock); |
260 | list_del_init(&up_ptr->uport_list); | 260 | list_del_init(&up_ptr->uport_list); |
261 | spin_unlock_bh(®_lock); | 261 | spin_unlock_bh(®_lock); |
262 | return TIPC_OK; | 262 | return 0; |
263 | } | 263 | } |
264 | 264 | ||