net: return operator cleanup

[pandora-kernel.git] / include / net / tipc / tipc_msg.h

diff --git a/include/net/tipc/tipc_msg.h b/include/net/tipc/tipc_msg.h
index fb42eb7..ffe50b4 100644 (file)
--- a/include/net/tipc/tipc_msg.h
+++ b/include/net/tipc/tipc_msg.h
@@ -107,7 +107,7 @@ static inline u32 msg_hdr_sz(struct tipc_msg *m)
 
 static inline int msg_short(struct tipc_msg *m)
 {
-       return (msg_hdr_sz(m) == 24);
+       return msg_hdr_sz(m) == 24;
 }
 
 static inline u32 msg_size(struct tipc_msg *m)
@@ -117,7 +117,7 @@ static inline u32 msg_size(struct tipc_msg *m)
 
 static inline u32 msg_data_sz(struct tipc_msg *m)
 {
-       return (msg_size(m) - msg_hdr_sz(m));
+       return msg_size(m) - msg_hdr_sz(m);
 }
 
 static inline unchar *msg_data(struct tipc_msg *m)
@@ -130,24 +130,19 @@ static inline u32 msg_type(struct tipc_msg *m)
        return msg_bits(m, 1, 29, 0x7);
 }
 
-static inline u32 msg_direct(struct tipc_msg *m)
-{
-       return (msg_type(m) == TIPC_DIRECT_MSG);
-}
-
 static inline u32 msg_named(struct tipc_msg *m)
 {
-       return (msg_type(m) == TIPC_NAMED_MSG);
+       return msg_type(m) == TIPC_NAMED_MSG;
 }
 
 static inline u32 msg_mcast(struct tipc_msg *m)
 {
-       return (msg_type(m) == TIPC_MCAST_MSG);
+       return msg_type(m) == TIPC_MCAST_MSG;
 }
 
 static inline u32 msg_connected(struct tipc_msg *m)
 {
-       return (msg_type(m) == TIPC_CONN_MSG);
+       return msg_type(m) == TIPC_CONN_MSG;
 }
 
 static inline u32 msg_errcode(struct tipc_msg *m)
@@ -207,17 +202,6 @@ static inline u32 msg_nameupper(struct tipc_msg *m)
        return msg_word(m, 10);
 }
 
-static inline char *msg_options(struct tipc_msg *m, u32 *len)
-{
-       u32 pos = msg_bits(m, 1, 16, 0x7);
-
-       if (!pos)
-               return 0;
-       pos = (pos * 4) + 28;
-       *len = msg_hdr_sz(m) - pos;
-       return (char *)&m->hdr[pos/4];
-}
-
 #endif
 
 #endif