Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

RDMA/core: Return bool instead of int

Return bool for following internal and inline functions as their
underlying APIs return bool too.

1. cma_zero_addr()
2. cma_loopback_addr()
3. cma_any_addr()
4. ib_addr_any()
5. ib_addr_loopback()

While we are touching cma_loopback_addr(), remove extra white spaces
in it.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

authored by

Parav Pandit and committed by
Jason Gunthorpe
ca3a8ace 05e0b86c

+15 -12
+13 -10
drivers/infiniband/core/cma.c
··· 1046 1046 } 1047 1047 EXPORT_SYMBOL(rdma_init_qp_attr); 1048 1048 1049 - static inline int cma_zero_addr(const struct sockaddr *addr) 1049 + static inline bool cma_zero_addr(const struct sockaddr *addr) 1050 1050 { 1051 1051 switch (addr->sa_family) { 1052 1052 case AF_INET: 1053 1053 return ipv4_is_zeronet(((struct sockaddr_in *)addr)->sin_addr.s_addr); 1054 1054 case AF_INET6: 1055 - return ipv6_addr_any(&((struct sockaddr_in6 *) addr)->sin6_addr); 1055 + return ipv6_addr_any(&((struct sockaddr_in6 *)addr)->sin6_addr); 1056 1056 case AF_IB: 1057 - return ib_addr_any(&((struct sockaddr_ib *) addr)->sib_addr); 1057 + return ib_addr_any(&((struct sockaddr_ib *)addr)->sib_addr); 1058 1058 default: 1059 - return 0; 1059 + return false; 1060 1060 } 1061 1061 } 1062 1062 1063 - static inline int cma_loopback_addr(const struct sockaddr *addr) 1063 + static inline bool cma_loopback_addr(const struct sockaddr *addr) 1064 1064 { 1065 1065 switch (addr->sa_family) { 1066 1066 case AF_INET: 1067 - return ipv4_is_loopback(((struct sockaddr_in *) addr)->sin_addr.s_addr); 1067 + return ipv4_is_loopback( 1068 + ((struct sockaddr_in *)addr)->sin_addr.s_addr); 1068 1069 case AF_INET6: 1069 - return ipv6_addr_loopback(&((struct sockaddr_in6 *) addr)->sin6_addr); 1070 + return ipv6_addr_loopback( 1071 + &((struct sockaddr_in6 *)addr)->sin6_addr); 1070 1072 case AF_IB: 1071 - return ib_addr_loopback(&((struct sockaddr_ib *) addr)->sib_addr); 1073 + return ib_addr_loopback( 1074 + &((struct sockaddr_ib *)addr)->sib_addr); 1072 1075 default: 1073 - return 0; 1076 + return false; 1074 1077 } 1075 1078 } 1076 1079 1077 - static inline int cma_any_addr(const struct sockaddr *addr) 1080 + static inline bool cma_any_addr(const struct sockaddr *addr) 1078 1081 { 1079 1082 return cma_zero_addr(addr) || cma_loopback_addr(addr); 1080 1083 }
+2 -2
include/rdma/ib.h
··· 53 53 #define sib_interface_id ib_u.uib_addr64[1] 54 54 }; 55 55 56 - static inline int ib_addr_any(const struct ib_addr *a) 56 + static inline bool ib_addr_any(const struct ib_addr *a) 57 57 { 58 58 return ((a->sib_addr64[0] | a->sib_addr64[1]) == 0); 59 59 } 60 60 61 - static inline int ib_addr_loopback(const struct ib_addr *a) 61 + static inline bool ib_addr_loopback(const struct ib_addr *a) 62 62 { 63 63 return ((a->sib_addr32[0] | a->sib_addr32[1] | 64 64 a->sib_addr32[2] | (a->sib_addr32[3] ^ htonl(1))) == 0);