diff --git a/net/bluetooth/bluetooth_recvmsg.c b/net/bluetooth/bluetooth_recvmsg.c
index be31b3af89c..5ed7d9915b9 100644
--- a/net/bluetooth/bluetooth_recvmsg.c
+++ b/net/bluetooth/bluetooth_recvmsg.c
@@ -308,8 +308,7 @@ ssize_t bluetooth_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
   size_t len = msg->msg_iov->iov_len;
   FAR struct sockaddr *from = msg->msg_name;
   FAR socklen_t *fromlen = &msg->msg_namelen;
-  FAR struct bluetooth_conn_s *conn =
-    (FAR struct bluetooth_conn_s *)psock->s_conn;
+  FAR struct bluetooth_conn_s *conn = psock->s_conn;
   FAR struct radio_driver_s *radio;
   struct bluetooth_recvfrom_s state;
   ssize_t ret;
diff --git a/net/bluetooth/bluetooth_sendmsg.c b/net/bluetooth/bluetooth_sendmsg.c
index 3410af95c8f..b2059b37bdd 100644
--- a/net/bluetooth/bluetooth_sendmsg.c
+++ b/net/bluetooth/bluetooth_sendmsg.c
@@ -254,7 +254,7 @@ static ssize_t bluetooth_sendto(FAR struct socket *psock,
       return -EBADF;
     }
 
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Verify that the address is large enough to be a valid PF_BLUETOOTH
    * address.
@@ -416,7 +416,7 @@ static ssize_t bluetooth_l2cap_send(FAR struct socket *psock,
   FAR struct bluetooth_conn_s *conn;
   ssize_t ret;
 
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   if (!_SS_ISCONNECTED(conn->bc_conn.s_flags))
diff --git a/net/bluetooth/bluetooth_sockif.c b/net/bluetooth/bluetooth_sockif.c
index 7d1eecde753..ff3a50ba47a 100644
--- a/net/bluetooth/bluetooth_sockif.c
+++ b/net/bluetooth/bluetooth_sockif.c
@@ -211,7 +211,7 @@ static void bluetooth_addref(FAR struct socket *psock)
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL &&
               (psock->s_type == SOCK_RAW || psock->s_type == SOCK_CTRL));
 
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn->bc_crefs > 0 && conn->bc_crefs < 255);
   conn->bc_crefs++;
 }
@@ -251,7 +251,7 @@ static int bluetooth_connect(FAR struct socket *psock,
   int ret = OK;
 
   DEBUGASSERT(psock != NULL || addr != NULL);
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Verify the address family */
@@ -395,7 +395,7 @@ static int bluetooth_l2cap_bind(FAR struct socket *psock,
       return -EBADF;
     }
 
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Verify that the socket is not already bound. */
 
@@ -468,7 +468,7 @@ static int bluetooth_hci_bind(FAR struct socket *psock,
       return -EBADF;
     }
 
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Verify that the socket is not already bound. */
 
@@ -523,7 +523,7 @@ static int bluetooth_getsockname(FAR struct socket *psock,
 
   DEBUGASSERT(psock != NULL && addr != NULL && addrlen != NULL);
 
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Create a copy of the full address on the stack */
@@ -590,7 +590,7 @@ static int bluetooth_getpeername(FAR struct socket *psock,
       return -EPFNOSUPPORT;
     }
 
-  conn = (FAR struct bluetooth_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Create a copy of the full address on the stack */
diff --git a/net/can/can_getsockopt.c b/net/can/can_getsockopt.c
index 1a1d375f5bc..d6d9153e824 100644
--- a/net/can/can_getsockopt.c
+++ b/net/can/can_getsockopt.c
@@ -82,7 +82,7 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
 
   DEBUGASSERT(psock != NULL && value != NULL && value_len != NULL &&
               psock->s_conn != NULL);
-  conn = (FAR struct can_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
 #ifdef CONFIG_NET_TIMESTAMP
   if (level == SOL_SOCKET && option == SO_TIMESTAMP)
diff --git a/net/can/can_recvmsg.c b/net/can/can_recvmsg.c
index 95baa34dcfb..d3234b06a5e 100644
--- a/net/can/can_recvmsg.c
+++ b/net/can/can_recvmsg.c
@@ -472,7 +472,7 @@ ssize_t can_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
 
-  conn = (FAR struct can_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   if (psock->s_type != SOCK_RAW)
     {
diff --git a/net/can/can_sendmsg.c b/net/can/can_sendmsg.c
index d993e6ae377..ce1c2bc033c 100644
--- a/net/can/can_sendmsg.c
+++ b/net/can/can_sendmsg.c
@@ -185,7 +185,7 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
       return -EDESTADDRREQ;
     }
 
-  conn = (FAR struct can_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Get the device driver that will service this transfer */
 
diff --git a/net/can/can_setsockopt.c b/net/can/can_setsockopt.c
index efa87ef9d52..dc45e7d4d96 100644
--- a/net/can/can_setsockopt.c
+++ b/net/can/can_setsockopt.c
@@ -80,7 +80,7 @@ int can_setsockopt(FAR struct socket *psock, int level, int option,
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
   DEBUGASSERT(value_len == 0 || value != NULL);
 
-  conn = (FAR struct can_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
 #ifdef CONFIG_NET_TIMESTAMP
 
diff --git a/net/can/can_sockif.c b/net/can/can_sockif.c
index 94d65485228..a0eb925c451 100644
--- a/net/can/can_sockif.c
+++ b/net/can/can_sockif.c
@@ -318,7 +318,7 @@ static int can_bind(FAR struct socket *psock,
   /* Save the address information in the connection structure */
 
   canaddr = (FAR struct sockaddr_can *)addr;
-  conn    = (FAR struct can_conn_s *)psock->s_conn;
+  conn    = psock->s_conn;
 
   /* Bind CAN device to socket */
 
@@ -366,7 +366,7 @@ static int can_poll_local(FAR struct socket *psock, FAR struct pollfd *fds,
   int ret = OK;
 
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
-  conn = (FAR struct can_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   info = conn->pollinfo;
 
   /* FIXME add NETDEV_DOWN support */
diff --git a/net/ieee802154/ieee802154_recvmsg.c b/net/ieee802154/ieee802154_recvmsg.c
index 5660bf3e5aa..f333420d126 100644
--- a/net/ieee802154/ieee802154_recvmsg.c
+++ b/net/ieee802154/ieee802154_recvmsg.c
@@ -308,8 +308,7 @@ ssize_t ieee802154_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
   size_t len = msg->msg_iov->iov_len;
   FAR struct sockaddr *from = msg->msg_name;
   FAR socklen_t *fromlen = &msg->msg_namelen;
-  FAR struct ieee802154_conn_s *conn =
-    (FAR struct ieee802154_conn_s *)psock->s_conn;
+  FAR struct ieee802154_conn_s *conn = psock->s_conn;
   FAR struct radio_driver_s *radio;
   struct ieee802154_recvfrom_s state;
   ssize_t ret;
diff --git a/net/ieee802154/ieee802154_sendmsg.c b/net/ieee802154/ieee802154_sendmsg.c
index fc5a49e765f..6be48ee9965 100644
--- a/net/ieee802154/ieee802154_sendmsg.c
+++ b/net/ieee802154/ieee802154_sendmsg.c
@@ -178,7 +178,7 @@ static void ieee802154_meta_data(FAR struct radio_driver_s *radio,
   psock    = pstate->is_sock;
   DEBUGASSERT(psock->s_conn != NULL);
 
-  conn     = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn     = psock->s_conn;
   srcaddr  = &conn->laddr;
   destaddr = &pstate->is_destaddr;
 
@@ -443,7 +443,7 @@ static ssize_t ieee802154_sendto(FAR struct socket *psock,
       return -EDESTADDRREQ;
     }
 
-  conn = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Verify that the address is large enough to be a valid PF_IEEE802154
    * address.
@@ -566,7 +566,7 @@ static ssize_t ieee802154_send(FAR struct socket *psock, FAR const void *buf,
   ssize_t ret;
 
   DEBUGASSERT(psock != NULL || buf != NULL);
-  conn = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Only SOCK_DGRAM is supported (because the MAC header is stripped) */
diff --git a/net/ieee802154/ieee802154_sockif.c b/net/ieee802154/ieee802154_sockif.c
index 9057989be19..6078172e5d0 100644
--- a/net/ieee802154/ieee802154_sockif.c
+++ b/net/ieee802154/ieee802154_sockif.c
@@ -202,7 +202,7 @@ static void ieee802154_addref(FAR struct socket *psock)
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL &&
               (psock->s_type == SOCK_DGRAM || psock->s_type == SOCK_CTRL));
 
-  conn = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn->crefs > 0 && conn->crefs < 255);
   conn->crefs++;
 }
@@ -248,7 +248,7 @@ static int ieee802154_connect(FAR struct socket *psock,
   int ret = OK;
 
   DEBUGASSERT(psock != NULL || addr != NULL);
-  conn = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Verify the address family */
@@ -315,7 +315,7 @@ static int ieee802154_bind(FAR struct socket *psock,
       return -EBADF;
     }
 
-  conn = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Bind a PF_IEEE802154 socket to an network device. */
 
@@ -402,7 +402,7 @@ static int ieee802154_getsockname(FAR struct socket *psock,
 
   DEBUGASSERT(psock != NULL && addr != NULL && addrlen != NULL);
 
-  conn = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Create a copy of the full address on the stack */
@@ -464,7 +464,7 @@ static int ieee802154_getpeername(FAR struct socket *psock,
 
   DEBUGASSERT(psock != NULL && addr != NULL && addrlen != NULL);
 
-  conn = (FAR struct ieee802154_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Create a copy of the full address on the stack */
diff --git a/net/inet/inet_sockif.c b/net/inet/inet_sockif.c
index 3933beadb75..d0b06feeb6c 100644
--- a/net/inet/inet_sockif.c
+++ b/net/inet/inet_sockif.c
@@ -1127,7 +1127,7 @@ int inet_listen(FAR struct socket *psock, int backlog)
 
 #ifdef CONFIG_NET_TCP
 #ifdef NET_TCP_HAVE_STACK
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   if (conn->lport <= 0)
     {
@@ -1284,7 +1284,7 @@ static int inet_connect(FAR struct socket *psock,
 
           /* Perform the connect/disconnect operation */
 
-          conn = (FAR struct udp_conn_s *)psock->s_conn;
+          conn = psock->s_conn;
 #if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
           if (conn->domain != addr->sa_family)
             {
diff --git a/net/inet/ipv4_getpeername.c b/net/inet/ipv4_getpeername.c
index 405f86ee7b2..12ccaab59c3 100644
--- a/net/inet/ipv4_getpeername.c
+++ b/net/inet/ipv4_getpeername.c
@@ -100,8 +100,7 @@ int ipv4_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_TCP_HAVE_STACK
       case SOCK_STREAM:
         {
-          FAR struct tcp_conn_s *tcp_conn =
-            (FAR struct tcp_conn_s *)psock->s_conn;
+          FAR struct tcp_conn_s *tcp_conn = psock->s_conn;
 
           outaddr->sin_port = tcp_conn->rport; /* Already in network byte order */
           ripaddr           = tcp_conn->u.ipv4.raddr;
@@ -112,8 +111,7 @@ int ipv4_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_UDP_HAVE_STACK
       case SOCK_DGRAM:
         {
-          FAR struct udp_conn_s *udp_conn =
-            (FAR struct udp_conn_s *)psock->s_conn;
+          FAR struct udp_conn_s *udp_conn = psock->s_conn;
 
           outaddr->sin_port = udp_conn->rport; /* Already in network byte order */
           ripaddr           = udp_conn->u.ipv4.raddr;
diff --git a/net/inet/ipv4_getsockname.c b/net/inet/ipv4_getsockname.c
index 95f3eb1ed74..89df7adbafa 100644
--- a/net/inet/ipv4_getsockname.c
+++ b/net/inet/ipv4_getsockname.c
@@ -93,8 +93,7 @@ int ipv4_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_TCP_HAVE_STACK
       case SOCK_STREAM:
         {
-          FAR struct tcp_conn_s *tcp_conn =
-                                (FAR struct tcp_conn_s *)psock->s_conn;
+          FAR struct tcp_conn_s *tcp_conn = psock->s_conn;
 
           outaddr->sin_port = tcp_conn->lport; /* Already in network byte order */
           lipaddr           = tcp_conn->u.ipv4.laddr;
@@ -106,8 +105,7 @@ int ipv4_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_UDP_HAVE_STACK
       case SOCK_DGRAM:
         {
-          FAR struct udp_conn_s *udp_conn =
-                                (FAR struct udp_conn_s *)psock->s_conn;
+          FAR struct udp_conn_s *udp_conn = psock->s_conn;
 
           outaddr->sin_port = udp_conn->lport; /* Already in network byte order */
           lipaddr           = udp_conn->u.ipv4.laddr;
diff --git a/net/inet/ipv4_getsockopt.c b/net/inet/ipv4_getsockopt.c
index 97bb5d83950..bb1c6cf3a17 100644
--- a/net/inet/ipv4_getsockopt.c
+++ b/net/inet/ipv4_getsockopt.c
@@ -86,8 +86,7 @@ int ipv4_getsockopt(FAR struct socket *psock, int option,
 
       case IP_TOS:
         {
-          FAR struct socket_conn_s *conn =
-                           (FAR struct socket_conn_s *)psock->s_conn;
+          FAR struct socket_conn_s *conn = psock->s_conn;
 
           *(FAR uint8_t *)value = conn->s_tos;
           *value_len = 1;
diff --git a/net/inet/ipv4_setsockopt.c b/net/inet/ipv4_setsockopt.c
index 0b817fdc5f5..f0e3a04b76a 100644
--- a/net/inet/ipv4_setsockopt.c
+++ b/net/inet/ipv4_setsockopt.c
@@ -199,7 +199,7 @@ int ipv4_setsockopt(FAR struct socket *psock, int option,
             }
           else
             {
-              conn = (FAR struct udp_conn_s *)psock->s_conn;
+              conn = psock->s_conn;
               conn->ttl = ttl;
               ret = OK;
             }
@@ -247,7 +247,7 @@ int ipv4_setsockopt(FAR struct socket *psock, int option,
           enable = (value_len >= sizeof(int)) ?
             *(FAR int *)value : (int)*(FAR unsigned char *)value;
 
-          conn = (FAR struct socket_conn_s *)psock->s_conn;
+          conn = psock->s_conn;
           if (enable)
             {
               _SO_SETOPT(conn->s_options, option);
@@ -263,8 +263,7 @@ int ipv4_setsockopt(FAR struct socket *psock, int option,
 
       case IP_TOS:
         {
-          FAR struct socket_conn_s *conn =
-                           (FAR struct socket_conn_s *)psock->s_conn;
+          FAR struct socket_conn_s *conn = psock->s_conn;
           int tos;
 
           tos = (value_len >= sizeof(int)) ?
diff --git a/net/inet/ipv6_getpeername.c b/net/inet/ipv6_getpeername.c
index f3f4d557ee4..4f1cadf6c83 100644
--- a/net/inet/ipv6_getpeername.c
+++ b/net/inet/ipv6_getpeername.c
@@ -99,8 +99,7 @@ int ipv6_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_TCP_HAVE_STACK
       case SOCK_STREAM:
         {
-          FAR struct tcp_conn_s *tcp_conn =
-            (FAR struct tcp_conn_s *)psock->s_conn;
+          FAR struct tcp_conn_s *tcp_conn = psock->s_conn;
 
           outaddr->sin6_port = tcp_conn->lport; /* Already in network byte order */
           ripaddr            = &tcp_conn->u.ipv6.raddr;
@@ -111,8 +110,7 @@ int ipv6_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_UDP_HAVE_STACK
       case SOCK_DGRAM:
         {
-          FAR struct udp_conn_s *udp_conn =
-            (FAR struct udp_conn_s *)psock->s_conn;
+          FAR struct udp_conn_s *udp_conn = psock->s_conn;
 
           outaddr->sin6_port = udp_conn->lport; /* Already in network byte order */
           ripaddr            = &udp_conn->u.ipv6.raddr;
diff --git a/net/inet/ipv6_getsockname.c b/net/inet/ipv6_getsockname.c
index 8c323e7142c..771b0046e19 100644
--- a/net/inet/ipv6_getsockname.c
+++ b/net/inet/ipv6_getsockname.c
@@ -92,8 +92,7 @@ int ipv6_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_TCP_HAVE_STACK
       case SOCK_STREAM:
         {
-          FAR struct tcp_conn_s *tcp_conn =
-                                (FAR struct tcp_conn_s *)psock->s_conn;
+          FAR struct tcp_conn_s *tcp_conn = psock->s_conn;
 
           outaddr->sin6_port = tcp_conn->lport; /* Already in network byte order */
           lipaddr            = &tcp_conn->u.ipv6.laddr;
@@ -105,8 +104,7 @@ int ipv6_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
 #ifdef NET_UDP_HAVE_STACK
       case SOCK_DGRAM:
         {
-          FAR struct udp_conn_s *udp_conn =
-                                (FAR struct udp_conn_s *)psock->s_conn;
+          FAR struct udp_conn_s *udp_conn = psock->s_conn;
 
           outaddr->sin6_port = udp_conn->lport; /* Already in network byte order */
           lipaddr            = &udp_conn->u.ipv6.laddr;
diff --git a/net/inet/ipv6_getsockopt.c b/net/inet/ipv6_getsockopt.c
index 610bae1d428..151fb8d6106 100644
--- a/net/inet/ipv6_getsockopt.c
+++ b/net/inet/ipv6_getsockopt.c
@@ -77,8 +77,7 @@ int ipv6_getsockopt(FAR struct socket *psock, int option,
     {
       case IPV6_TCLASS:
         {
-          FAR struct socket_conn_s *conn =
-                           (FAR struct socket_conn_s *)psock->s_conn;
+          FAR struct socket_conn_s *conn = psock->s_conn;
 
           *(FAR uint8_t *)value = conn->s_tclass;
           *value_len = 1;
diff --git a/net/inet/ipv6_setsockopt.c b/net/inet/ipv6_setsockopt.c
index 69692a6da1a..c55aa249d07 100644
--- a/net/inet/ipv6_setsockopt.c
+++ b/net/inet/ipv6_setsockopt.c
@@ -157,8 +157,7 @@ int ipv6_setsockopt(FAR struct socket *psock, int option,
 
       case IPV6_TCLASS:
         {
-          FAR struct socket_conn_s *conn =
-                           (FAR struct socket_conn_s *)psock->s_conn;
+          FAR struct socket_conn_s *conn = psock->s_conn;
           int tclass;
 
           tclass = (value_len >= sizeof(int)) ?
diff --git a/net/local/local_accept.c b/net/local/local_accept.c
index c198c99ec71..e1f099e425b 100644
--- a/net/local/local_accept.c
+++ b/net/local/local_accept.c
@@ -122,7 +122,7 @@ int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
    * address
    */
 
-  server = (FAR struct local_conn_s *)psock->s_conn;
+  server = psock->s_conn;
 
   if (server->lc_proto != SOCK_STREAM ||
       server->lc_state != LOCAL_STATE_LISTENING ||
diff --git a/net/local/local_bind.c b/net/local/local_bind.c
index dbcf9f74d2e..a664c0b8436 100644
--- a/net/local/local_bind.c
+++ b/net/local/local_bind.c
@@ -61,7 +61,7 @@ int psock_local_bind(FAR struct socket *psock,
       return -EINVAL;
     }
 
-  conn = (FAR struct local_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Save the address family */
 
diff --git a/net/local/local_connect.c b/net/local/local_connect.c
index 4fc3b3643d0..9ace340c3bf 100644
--- a/net/local/local_connect.c
+++ b/net/local/local_connect.c
@@ -246,7 +246,7 @@ int psock_local_connect(FAR struct socket *psock,
   int ret;
 
   DEBUGASSERT(psock && psock->s_conn);
-  client = (FAR struct local_conn_s *)psock->s_conn;
+  client = psock->s_conn;
 
   if (client->lc_state == LOCAL_STATE_ACCEPT ||
       client->lc_state == LOCAL_STATE_CONNECTED)
diff --git a/net/local/local_listen.c b/net/local/local_listen.c
index e468f512c87..89a3c1b2667 100644
--- a/net/local/local_listen.c
+++ b/net/local/local_listen.c
@@ -81,7 +81,7 @@ int local_listen(FAR struct socket *psock, int backlog)
 
   net_lock();
 
-  server = (FAR struct local_conn_s *)psock->s_conn;
+  server = psock->s_conn;
 
   /* Some sanity checks */
 
diff --git a/net/local/local_netpoll.c b/net/local/local_netpoll.c
index dd8a8814ea4..f1df7756fd6 100644
--- a/net/local/local_netpoll.c
+++ b/net/local/local_netpoll.c
@@ -160,7 +160,7 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
   FAR struct local_conn_s *conn;
   int ret = -ENOSYS;
 
-  conn = (FAR struct local_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   if (conn->lc_proto == SOCK_DGRAM)
     {
@@ -314,7 +314,7 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
   FAR struct local_conn_s *conn;
   int ret = OK;
 
-  conn = (FAR struct local_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   if (conn->lc_proto == SOCK_DGRAM)
     {
diff --git a/net/local/local_recvmsg.c b/net/local/local_recvmsg.c
index df1dbc8e261..e106cc86a01 100644
--- a/net/local/local_recvmsg.c
+++ b/net/local/local_recvmsg.c
@@ -58,7 +58,7 @@
 static int psock_fifo_read(FAR struct socket *psock, FAR void *buf,
                            FAR size_t *readlen, bool once)
 {
-  FAR struct local_conn_s *conn = (FAR struct local_conn_s *)psock->s_conn;
+  FAR struct local_conn_s *conn = psock->s_conn;
   int ret;
 
   ret = local_fifo_read(&conn->lc_infile, buf, readlen, once);
@@ -206,7 +206,7 @@ psock_stream_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
                       int flags, FAR struct sockaddr *from,
                       FAR socklen_t *fromlen)
 {
-  FAR struct local_conn_s *conn = (FAR struct local_conn_s *)psock->s_conn;
+  FAR struct local_conn_s *conn = psock->s_conn;
   size_t readlen = len;
   int ret;
 
@@ -274,7 +274,7 @@ psock_dgram_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
                      int flags, FAR struct sockaddr *from,
                      FAR socklen_t *fromlen)
 {
-  FAR struct local_conn_s *conn = (FAR struct local_conn_s *)psock->s_conn;
+  FAR struct local_conn_s *conn = psock->s_conn;
   uint16_t pktlen;
   size_t readlen;
   int ret;
diff --git a/net/local/local_sendmsg.c b/net/local/local_sendmsg.c
index 8178731ec0f..0fef4d946ab 100644
--- a/net/local/local_sendmsg.c
+++ b/net/local/local_sendmsg.c
@@ -176,7 +176,7 @@ static ssize_t local_send(FAR struct socket *psock,
           /* Local TCP packet send */
 
           DEBUGASSERT(psock && psock->s_conn && buf);
-          peer = (FAR struct local_conn_s *)psock->s_conn;
+          peer = psock->s_conn;
 
           /* Verify that this is a connected peer socket and that it has
            * opened the outgoing FIFO for write-only access.
@@ -268,7 +268,7 @@ static ssize_t local_sendto(FAR struct socket *psock,
                             socklen_t tolen)
 {
 #ifdef CONFIG_NET_LOCAL_DGRAM
-  FAR struct local_conn_s *conn = (FAR struct local_conn_s *)psock->s_conn;
+  FAR struct local_conn_s *conn = psock->s_conn;
   FAR struct sockaddr_un *unaddr = (FAR struct sockaddr_un *)to;
   ssize_t ret;
 
diff --git a/net/local/local_sockif.c b/net/local/local_sockif.c
index b7ed2529419..8b6a1918f6c 100644
--- a/net/local/local_sockif.c
+++ b/net/local/local_sockif.c
@@ -379,7 +379,7 @@ static int local_getsockname(FAR struct socket *psock,
       return OK;
     }
 
-  conn = (FAR struct local_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Save the address family */
 
@@ -751,7 +751,7 @@ static int local_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
   FAR struct local_conn_s *conn;
   int ret = OK;
 
-  conn = (FAR struct local_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   switch (cmd)
     {
diff --git a/net/netlink/netlink_sockif.c b/net/netlink/netlink_sockif.c
index 8397a5520ba..5c9ac9887aa 100644
--- a/net/netlink/netlink_sockif.c
+++ b/net/netlink/netlink_sockif.c
@@ -253,7 +253,7 @@ static int netlink_bind(FAR struct socket *psock,
   /* Save the address information in the connection structure */
 
   nladdr = (FAR struct sockaddr_nl *)addr;
-  conn   = (FAR struct netlink_conn_s *)psock->s_conn;
+  conn   = psock->s_conn;
 
   conn->pid    = nladdr->nl_pid ? nladdr->nl_pid : nxsched_gettid();
   conn->groups = nladdr->nl_groups;
@@ -293,7 +293,7 @@ static int netlink_getsockname(FAR struct socket *psock,
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL && addr != NULL &&
               addrlen != NULL && *addrlen >= sizeof(struct sockaddr_nl));
 
-  conn = (FAR struct netlink_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Return the address information in the address structure */
 
@@ -346,7 +346,7 @@ static int netlink_getpeername(FAR struct socket *psock,
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL && addr != NULL &&
               addrlen != NULL && *addrlen >= sizeof(struct sockaddr_nl));
 
-  conn = (FAR struct netlink_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Return the address information in the address structure */
 
@@ -392,7 +392,7 @@ static int netlink_connect(FAR struct socket *psock,
   /* Save the address information in the connection structure */
 
   nladdr = (FAR struct sockaddr_nl *)addr;
-  conn   = (FAR struct netlink_conn_s *)psock->s_conn;
+  conn   = psock->s_conn;
 
   conn->dst_pid    = nladdr->nl_pid;
   conn->dst_groups = nladdr->nl_groups;
@@ -476,7 +476,7 @@ static int netlink_poll(FAR struct socket *psock, FAR struct pollfd *fds,
   int ret = OK;
 
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
-  conn = (FAR struct netlink_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Check if we are setting up or tearing down the poll */
 
@@ -595,7 +595,7 @@ static ssize_t netlink_sendmsg(FAR struct socket *psock,
 
   /* Get the underlying connection structure */
 
-  conn = (FAR struct netlink_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   if (to == NULL)
     {
       /* netlink_send() */
diff --git a/net/pkt/pkt_recvmsg.c b/net/pkt/pkt_recvmsg.c
index 605d1cbfbd0..400b8241b91 100644
--- a/net/pkt/pkt_recvmsg.c
+++ b/net/pkt/pkt_recvmsg.c
@@ -394,7 +394,7 @@ ssize_t pkt_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
   size_t len = msg->msg_iov->iov_len;
   FAR struct sockaddr *from = msg->msg_name;
   FAR socklen_t *fromlen = &msg->msg_namelen;
-  FAR struct pkt_conn_s *conn = (FAR struct pkt_conn_s *)psock->s_conn;
+  FAR struct pkt_conn_s *conn = psock->s_conn;
   FAR struct net_driver_s *dev;
   struct pkt_recvfrom_s state;
   ssize_t ret;
diff --git a/net/pkt/pkt_sendmsg.c b/net/pkt/pkt_sendmsg.c
index b8acce8e03e..6f4539d7078 100644
--- a/net/pkt/pkt_sendmsg.c
+++ b/net/pkt/pkt_sendmsg.c
@@ -201,7 +201,7 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
   /* Get the device driver that will service this transfer */
 
-  dev = pkt_find_device((FAR struct pkt_conn_s *)psock->s_conn);
+  dev = pkt_find_device(psock->s_conn);
   if (dev == NULL)
     {
       return -ENODEV;
@@ -223,7 +223,7 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
 
   if (len > 0)
     {
-      FAR struct pkt_conn_s *conn = (FAR struct pkt_conn_s *)psock->s_conn;
+      FAR struct pkt_conn_s *conn = psock->s_conn;
 
       /* Allocate resource to receive a callback */
 
diff --git a/net/pkt/pkt_sockif.c b/net/pkt/pkt_sockif.c
index 47a073091ab..62eeedf3bd8 100644
--- a/net/pkt/pkt_sockif.c
+++ b/net/pkt/pkt_sockif.c
@@ -236,7 +236,7 @@ static int pkt_bind(FAR struct socket *psock,
 
   if (psock->s_type == SOCK_RAW || psock->s_type == SOCK_CTRL)
     {
-      FAR struct pkt_conn_s *conn = (FAR struct pkt_conn_s *)psock->s_conn;
+      FAR struct pkt_conn_s *conn = psock->s_conn;
       FAR struct net_driver_s *dev;
 
       /* Look at the addr and identify the network interface */
diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c
index b3db42e815a..649de5675c0 100644
--- a/net/sixlowpan/sixlowpan_tcpsend.c
+++ b/net/sixlowpan/sixlowpan_tcpsend.c
@@ -731,7 +731,7 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf,
 
   /* Get the underlying TCP connection structure */
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Make sure that this is a connected TCP socket */
 
diff --git a/net/sixlowpan/sixlowpan_udpsend.c b/net/sixlowpan/sixlowpan_udpsend.c
index d0a6d26ad9c..878e4df5f54 100644
--- a/net/sixlowpan/sixlowpan_udpsend.c
+++ b/net/sixlowpan/sixlowpan_udpsend.c
@@ -186,7 +186,7 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
 
   /* Get the underlying UDP "connection" structure */
 
-  conn = (FAR struct udp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Route outgoing message to the correct device */
@@ -351,7 +351,7 @@ ssize_t psock_6lowpan_udp_send(FAR struct socket *psock, FAR const void *buf,
 
   /* Get the underlying UDP "connection" structure */
 
-  conn = (FAR struct udp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Was the UDP socket connected via connect()? */
 
diff --git a/net/socket/net_fstat.c b/net/socket/net_fstat.c
index 7a26a5e3e97..a35b5d95940 100644
--- a/net/socket/net_fstat.c
+++ b/net/socket/net_fstat.c
@@ -108,8 +108,7 @@ int psock_fstat(FAR struct socket *psock, FAR struct stat *buf)
 #if defined(NET_TCP_HAVE_STACK)
        case SOCK_STREAM:
          {
-           FAR struct tcp_conn_s *tcp_conn =
-                       (FAR struct tcp_conn_s *)psock->s_conn;
+           FAR struct tcp_conn_s *tcp_conn = psock->s_conn;
 
            /* For TCP, the MSS is a dynamic value that maintained in the
             * connection structure.
@@ -123,8 +122,7 @@ int psock_fstat(FAR struct socket *psock, FAR struct stat *buf)
 #if defined(NET_UDP_HAVE_STACK)
        case SOCK_DGRAM:
          {
-           FAR struct udp_conn_s *udp_conn =
-                                   (FAR struct udp_conn_s *)psock->s_conn;
+           FAR struct udp_conn_s *udp_conn = psock->s_conn;
            FAR struct net_driver_s *dev;
            uint16_t iplen;
 
diff --git a/net/tcp/tcp_accept.c b/net/tcp/tcp_accept.c
index b31664bfff2..07fb4d91679 100644
--- a/net/tcp/tcp_accept.c
+++ b/net/tcp/tcp_accept.c
@@ -223,7 +223,7 @@ int psock_tcp_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
    * this listener.
    */
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
 #ifdef CONFIG_NET_TCPBACKLOG
   state.acpt_newconn = tcp_backlogremove(conn);
diff --git a/net/tcp/tcp_close.c b/net/tcp/tcp_close.c
index 3f1eb46ae2b..3892d898c77 100644
--- a/net/tcp/tcp_close.c
+++ b/net/tcp/tcp_close.c
@@ -217,7 +217,7 @@ static inline int tcp_close_disconnect(FAR struct socket *psock)
 
   net_lock();
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   /* Discard our reference to the connection */
diff --git a/net/tcp/tcp_getsockopt.c b/net/tcp/tcp_getsockopt.c
index c8d3d7142f1..66e1006e630 100644
--- a/net/tcp/tcp_getsockopt.c
+++ b/net/tcp/tcp_getsockopt.c
@@ -87,7 +87,7 @@ int tcp_getsockopt(FAR struct socket *psock, int option,
 
   DEBUGASSERT(psock != NULL && value != NULL && value_len != NULL &&
               psock->s_conn != NULL);
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* All of the TCP protocol options apply only TCP sockets.  The sockets
    * do not have to be connected.. that might occur later with the KeepAlive
diff --git a/net/tcp/tcp_monitor.c b/net/tcp/tcp_monitor.c
index 5c620f4045f..b5ee8b094fe 100644
--- a/net/tcp/tcp_monitor.c
+++ b/net/tcp/tcp_monitor.c
@@ -147,8 +147,7 @@ static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev,
       else if ((flags & TCP_CONNECTED) != 0)
         {
 #if 0 /* REVISIT: Assertion fires.  Why? */
-          FAR struct tcp_conn_s *conn =
-            (FAR struct tcp_conn_s *)psock->s_conn;
+          FAR struct tcp_conn_s *conn = psock->s_conn;
 
           /* Make sure that this is the device bound to the connection */
 
@@ -250,7 +249,7 @@ int tcp_start_monitor(FAR struct socket *psock)
   bool nonblock_conn;
 
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   net_lock();
 
diff --git a/net/tcp/tcp_recvfrom.c b/net/tcp/tcp_recvfrom.c
index 8ebf4e40aac..c3c3f08cd9e 100644
--- a/net/tcp/tcp_recvfrom.c
+++ b/net/tcp/tcp_recvfrom.c
@@ -606,7 +606,7 @@ ssize_t psock_tcp_recvfrom(FAR struct socket *psock, FAR struct msghdr *msg,
 
   net_lock();
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Initialize the state structure.  This is done with the network locked
    * because we don't want anything to happen until we are ready.
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index a5e642eeda5..144484310d0 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -1231,7 +1231,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
       goto errout;
     }
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   if (!_SS_ISCONNECTED(conn->sconn.s_flags))
     {
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 7ebe2cb598c..829fd2363d7 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -485,7 +485,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
       goto errout;
     }
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Check early if this is an un-connected socket, if so, then
    * return -ENOTCONN. Note, we will have to check this again, as we can't
diff --git a/net/tcp/tcp_setsockopt.c b/net/tcp/tcp_setsockopt.c
index 1123d71e925..a4f1029dbe2 100644
--- a/net/tcp/tcp_setsockopt.c
+++ b/net/tcp/tcp_setsockopt.c
@@ -76,7 +76,7 @@ int tcp_setsockopt(FAR struct socket *psock, int option,
   int ret = OK;
 
   DEBUGASSERT(psock != NULL && value != NULL && psock->s_conn != NULL);
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* All of the TCP protocol options apply only TCP sockets.  The sockets
    * do not have to be connected.. that might occur later with the KeepAlive
diff --git a/net/tcp/tcp_shutdown.c b/net/tcp/tcp_shutdown.c
index c96d62dc23a..282c78a60c2 100644
--- a/net/tcp/tcp_shutdown.c
+++ b/net/tcp/tcp_shutdown.c
@@ -105,7 +105,7 @@ static inline int tcp_send_fin(FAR struct socket *psock)
 
   net_lock();
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
   if ((conn->tcpstateflags == TCP_ESTABLISHED ||
diff --git a/net/tcp/tcp_txdrain.c b/net/tcp/tcp_txdrain.c
index 2b04f611a54..1815e564d4d 100644
--- a/net/tcp/tcp_txdrain.c
+++ b/net/tcp/tcp_txdrain.c
@@ -95,7 +95,7 @@ int tcp_txdrain(FAR struct socket *psock, unsigned int timeout)
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
   DEBUGASSERT(psock->s_type == SOCK_STREAM);
 
-  conn = (FAR struct tcp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Initialize the wait semaphore */
 
diff --git a/net/udp/udp_close.c b/net/udp/udp_close.c
index 528a4f3aa1b..0c2368a9ab1 100644
--- a/net/udp/udp_close.c
+++ b/net/udp/udp_close.c
@@ -67,7 +67,7 @@ int udp_close(FAR struct socket *psock)
 
   net_lock();
 
-  conn = (FAR struct udp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
 #ifdef CONFIG_NET_SOLINGER
diff --git a/net/udp/udp_recvfrom.c b/net/udp/udp_recvfrom.c
index 675307cafad..b8cc4837c01 100644
--- a/net/udp/udp_recvfrom.c
+++ b/net/udp/udp_recvfrom.c
@@ -546,7 +546,7 @@ static ssize_t udp_recvfrom_result(int result, struct udp_recvfrom_s *pstate)
 ssize_t psock_udp_recvfrom(FAR struct socket *psock, FAR struct msghdr *msg,
                            int flags)
 {
-  FAR struct udp_conn_s *conn = (FAR struct udp_conn_s *)psock->s_conn;
+  FAR struct udp_conn_s *conn = psock->s_conn;
   FAR struct net_driver_s *dev;
   struct udp_recvfrom_s state;
   int ret;
diff --git a/net/udp/udp_txdrain.c b/net/udp/udp_txdrain.c
index d02aa094f02..949b1afa4ce 100644
--- a/net/udp/udp_txdrain.c
+++ b/net/udp/udp_txdrain.c
@@ -95,7 +95,7 @@ int udp_txdrain(FAR struct socket *psock, unsigned int timeout)
   DEBUGASSERT(psock != NULL && psock->s_conn != NULL);
   DEBUGASSERT(psock->s_type == SOCK_DGRAM);
 
-  conn = (FAR struct udp_conn_s *)psock->s_conn;
+  conn = psock->s_conn;
 
   /* Initialize the wait semaphore */