diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-02-07 21:17:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-07 21:17:13 -0500 |
| commit | 86121fe5b4f170829429433cd99ec7f884c8ae75 (patch) | |
| tree | 8d6d7f310554a04f157a53684fe93434e9a03325 | |
| parent | 04f217aca4d803fe72c2c54fe460d68f5233ce52 (diff) | |
[TIPC]: Kill unused static inline (x5)
All these static inlines are unused:
in_own_zone 1 (net/tipc/addr.h)
msg_dataoctet 1 (net/tipc/msg.h)
msg_direct 1 (include/net/tipc/tipc_msg.h)
msg_options 1 (include/net/tipc/tipc_msg.h)
tipc_nmap_get 1 (net/tipc/bcast.h)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/tipc/tipc_msg.h | 16 | ||||
| -rw-r--r-- | net/tipc/addr.h | 5 | ||||
| -rw-r--r-- | net/tipc/bcast.h | 13 | ||||
| -rw-r--r-- | net/tipc/msg.h | 5 |
4 files changed, 0 insertions, 39 deletions
diff --git a/include/net/tipc/tipc_msg.h b/include/net/tipc/tipc_msg.h index fb42eb7a86a5..2e159a812f83 100644 --- a/include/net/tipc/tipc_msg.h +++ b/include/net/tipc/tipc_msg.h | |||
| @@ -130,11 +130,6 @@ static inline u32 msg_type(struct tipc_msg *m) | |||
| 130 | return msg_bits(m, 1, 29, 0x7); | 130 | return msg_bits(m, 1, 29, 0x7); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | static inline u32 msg_direct(struct tipc_msg *m) | ||
| 134 | { | ||
| 135 | return (msg_type(m) == TIPC_DIRECT_MSG); | ||
| 136 | } | ||
| 137 | |||
| 138 | static inline u32 msg_named(struct tipc_msg *m) | 133 | static inline u32 msg_named(struct tipc_msg *m) |
| 139 | { | 134 | { |
| 140 | return (msg_type(m) == TIPC_NAMED_MSG); | 135 | return (msg_type(m) == TIPC_NAMED_MSG); |
| @@ -207,17 +202,6 @@ static inline u32 msg_nameupper(struct tipc_msg *m) | |||
| 207 | return msg_word(m, 10); | 202 | return msg_word(m, 10); |
| 208 | } | 203 | } |
| 209 | 204 | ||
| 210 | static inline char *msg_options(struct tipc_msg *m, u32 *len) | ||
| 211 | { | ||
| 212 | u32 pos = msg_bits(m, 1, 16, 0x7); | ||
| 213 | |||
| 214 | if (!pos) | ||
| 215 | return 0; | ||
| 216 | pos = (pos * 4) + 28; | ||
| 217 | *len = msg_hdr_sz(m) - pos; | ||
| 218 | return (char *)&m->hdr[pos/4]; | ||
| 219 | } | ||
| 220 | |||
| 221 | #endif | 205 | #endif |
| 222 | 206 | ||
| 223 | #endif | 207 | #endif |
diff --git a/net/tipc/addr.h b/net/tipc/addr.h index e4bd5335e48d..3ba67e6ce03e 100644 --- a/net/tipc/addr.h +++ b/net/tipc/addr.h | |||
| @@ -57,11 +57,6 @@ static inline int in_own_cluster(u32 addr) | |||
| 57 | return !((addr ^ tipc_own_addr) >> 12); | 57 | return !((addr ^ tipc_own_addr) >> 12); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static inline int in_own_zone(u32 addr) | ||
| 61 | { | ||
| 62 | return !((addr ^ tipc_own_addr) >> 24); | ||
| 63 | } | ||
| 64 | |||
| 65 | static inline int is_slave(u32 addr) | 60 | static inline int is_slave(u32 addr) |
| 66 | { | 61 | { |
| 67 | return addr & 0x800; | 62 | return addr & 0x800; |
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h index f910ed29d055..a2416fa6b906 100644 --- a/net/tipc/bcast.h +++ b/net/tipc/bcast.h | |||
| @@ -74,19 +74,6 @@ extern char tipc_bclink_name[]; | |||
| 74 | 74 | ||
| 75 | 75 | ||
| 76 | /** | 76 | /** |
| 77 | * nmap_get - determine if node exists in a node map | ||
| 78 | */ | ||
| 79 | |||
| 80 | static inline int tipc_nmap_get(struct node_map *nm_ptr, u32 node) | ||
| 81 | { | ||
| 82 | int n = tipc_node(node); | ||
| 83 | int w = n / WSIZE; | ||
| 84 | int b = n % WSIZE; | ||
| 85 | |||
| 86 | return nm_ptr->map[w] & (1 << b); | ||
| 87 | } | ||
| 88 | |||
| 89 | /** | ||
| 90 | * nmap_add - add a node to a node map | 77 | * nmap_add - add a node to a node map |
| 91 | */ | 78 | */ |
| 92 | 79 | ||
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index ce2659836374..e9ef6df26562 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h | |||
| @@ -663,11 +663,6 @@ static inline void msg_set_remote_node(struct tipc_msg *m, u32 a) | |||
| 663 | msg_set_word(m, msg_hdr_sz(m)/4, a); | 663 | msg_set_word(m, msg_hdr_sz(m)/4, a); |
| 664 | } | 664 | } |
| 665 | 665 | ||
| 666 | static inline int msg_dataoctet(struct tipc_msg *m, u32 pos) | ||
| 667 | { | ||
| 668 | return(msg_data(m)[pos + 4] != 0); | ||
| 669 | } | ||
| 670 | |||
| 671 | static inline void msg_set_dataoctet(struct tipc_msg *m, u32 pos) | 666 | static inline void msg_set_dataoctet(struct tipc_msg *m, u32 pos) |
| 672 | { | 667 | { |
| 673 | msg_data(m)[pos + 4] = 1; | 668 | msg_data(m)[pos + 4] = 1; |
