Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 86121fe5b4f170829429433cd99ec7f884c8ae75

Authored by Ilpo Järvinen
Committed by David S. Miller
1 parent 04f217aca4
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 4 changed files with 0 additions and 39 deletions Side-by-side Diff

include/net/tipc/tipc_msg.h
Diff comments   View file @ 86121fe
... ... @@ -130,11 +130,6 @@
130 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 133 static inline u32 msg_named(struct tipc_msg *m)
139 134 {
140 135 return (msg_type(m) == TIPC_NAMED_MSG);
... ... @@ -205,17 +200,6 @@
205 200 static inline u32 msg_nameupper(struct tipc_msg *m)
206 201 {
207 202 return msg_word(m, 10);
208   -}
209   -
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 203 }
220 204  
221 205 #endif
... ... @@ -57,11 +57,6 @@
57 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 60 static inline int is_slave(u32 addr)
66 61 {
67 62 return addr & 0x800;
... ... @@ -74,19 +74,6 @@
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 77 * nmap_add - add a node to a node map
91 78 */
92 79  
... ... @@ -663,11 +663,6 @@
663 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 666 static inline void msg_set_dataoctet(struct tipc_msg *m, u32 pos)
672 667 {
673 668 msg_data(m)[pos + 4] = 1;