userspace/ptpd_netif: remove casts and assignments that are now redundant

Previous commits made a number of local variables and cast assignment
into identity operations. So this removes them.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

userspace/libwr/ptpd_netif.c

@@ -83,9 +83,8 @@ static inline int inside_range(int min, int max, int x)
 }
 
 /* For debugging/testing purposes */
-int ptpd_netif_get_dmtd_phase(struct wr_socket *sock, int32_t *phase)
+int ptpd_netif_get_dmtd_phase(struct wr_socket *s, int32_t *phase)
 {
-	struct wr_socket *s = (struct wr_socket *)sock;
 	hexp_port_state_t pstate;
 
 	halexp_get_port_state(&pstate, s->bind_addr.if_name);
@@ -95,9 +94,8 @@ int ptpd_netif_get_dmtd_phase(struct wr_socket *sock, int32_t *phase)
 	return pstate.phase_val_valid;
 }
 
-static void update_dmtd(struct wr_socket *sock)
+static void update_dmtd(struct wr_socket *s)
 {
-	struct wr_socket *s = (struct wr_socket *)sock;
 	hexp_port_state_t pstate;
 
 	if (tmo_expired(&s->dmtd_update_tmo)) {
@@ -276,13 +274,11 @@ struct wr_socket *ptpd_netif_create_socket(int sock_type, int flags,
 
 	tmo_init(&s->dmtd_update_tmo, DMTD_UPDATE_INTERVAL);
 
-	return (struct wr_socket *) s;
+	return s;
 }
 
-int ptpd_netif_close_socket(struct wr_socket *sock)
+int ptpd_netif_close_socket(struct wr_socket *s)
 {
-	struct wr_socket *s = (struct wr_socket *)sock;
-
 	if (!s)
 		return 0;
 
@@ -294,11 +290,10 @@ int ptpd_netif_close_socket(struct wr_socket *sock)
 static void poll_tx_timestamp(struct wr_socket *sock,
 			      struct wr_tstamp *tx_timestamp);
 
-int ptpd_netif_sendto(struct wr_socket *sock, struct wr_sockaddr *to, void *data,
+int ptpd_netif_sendto(struct wr_socket *s, struct wr_sockaddr *to, void *data,
 		      size_t data_length, struct wr_tstamp *tx_ts)
 {
 	struct etherpacket pkt;
-	struct wr_socket *s = (struct wr_socket *)sock;
 	struct sockaddr_ll sll;
 	int rval;
 
@@ -331,7 +326,7 @@ int ptpd_netif_sendto(struct wr_socket *sock, struct wr_sockaddr *to, void *data
 	rval = sendto(s->fd, &pkt, len, 0, (struct sockaddr *)&sll,
 		      sizeof(struct sockaddr_ll));
 
-	poll_tx_timestamp(sock, tx_ts);
+	poll_tx_timestamp(s, tx_ts);
 
 	return rval;
 }
@@ -348,11 +343,10 @@ static void hdump(uint8_t * buf, int size)
 #endif
 
 /* Waits for the transmission timestamp and stores it in tx_timestamp (if not null). */
-static void poll_tx_timestamp(struct wr_socket *sock, struct wr_tstamp *tx_timestamp)
+static void poll_tx_timestamp(struct wr_socket *s, struct wr_tstamp *tx_timestamp)
 {
 	char data[16384];
 
-	struct wr_socket *s = (struct wr_socket *)sock;
 	struct msghdr msg;
 	struct iovec entry;
 	struct sockaddr_ll from_addr;
@@ -411,10 +405,9 @@ static void poll_tx_timestamp(struct wr_socket *sock, struct wr_tstamp *tx_times
 	}
 }
 
-int ptpd_netif_recvfrom(struct wr_socket *sock, struct wr_sockaddr *from, void *data,
+int ptpd_netif_recvfrom(struct wr_socket *s, struct wr_sockaddr *from, void *data,
 			size_t data_length, struct wr_tstamp *rx_timestamp)
 {
-	struct wr_socket *s = (struct wr_socket *)sock;
 	struct etherpacket pkt;
 	struct msghdr msg;
 	struct iovec entry;
@@ -475,7 +468,7 @@ int ptpd_netif_recvfrom(struct wr_socket *sock, struct wr_sockaddr *from, void *
 		rx_timestamp->raw_nsec = sts->hwtimeraw.tv_nsec;
 		rx_timestamp->raw_ahead = cntr_ahead;
 
-		update_dmtd(sock);
+		update_dmtd(s);
 		if (s->dmtd_phase_valid) {
 			ptpd_netif_linearize_rx_timestamp(rx_timestamp,
 							  s->dmtd_phase,