[retry] Add timer_init() wrapper function

Standardise on using timer_init() to initialise an embedded retry
timer, to match the coding style used by other embedded objects.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

4 files changed, 7 insertions, 7 deletions

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 33212b062..fff331f7f 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -1442,10 +1442,10 @@ int start_dhcp ( struct job_interface *job, struct net_device *netdev ) {
 	ref_init ( &dhcp->refcnt, dhcp_free );
 	job_init ( &dhcp->job, &dhcp_job_operations, &dhcp->refcnt );
 	xfer_init ( &dhcp->xfer, &dhcp_xfer_operations, &dhcp->refcnt );
+	timer_init ( &dhcp->timer, dhcp_timer_expired );
 	dhcp->netdev = netdev_get ( netdev );
 	dhcp->local.sin_family = AF_INET;
 	dhcp->local.sin_port = htons ( BOOTPC_PORT );
-	dhcp->timer.expired = dhcp_timer_expired;
 
 	/* Instantiate child objects and attach to our interfaces */
 	if ( ( rc = xfer_open_socket ( &dhcp->xfer, SOCK_DGRAM, &dhcp_peer,
@@ -1545,13 +1545,13 @@ int start_pxebs ( struct job_interface *job, struct net_device *netdev,
 	ref_init ( &dhcp->refcnt, dhcp_free );
 	job_init ( &dhcp->job, &dhcp_job_operations, &dhcp->refcnt );
 	xfer_init ( &dhcp->xfer, &dhcp_xfer_operations, &dhcp->refcnt );
+	timer_init ( &dhcp->timer, dhcp_timer_expired );
 	dhcp->netdev = netdev_get ( netdev );
 	dhcp->local.sin_family = AF_INET;
 	fetch_ipv4_setting ( netdev_settings ( netdev ), &ip_setting,
 			     &dhcp->local.sin_addr );
 	dhcp->local.sin_port = htons ( BOOTPC_PORT );
 	dhcp->pxe_type = cpu_to_le16 ( pxe_type );
-	dhcp->timer.expired = dhcp_timer_expired;
 
 	/* Construct PXE boot server IP address lists */
 	pxe_discovery_control =
diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c
index 47fc6c75a..35ead0c74 100644
--- a/src/net/udp/dns.c
+++ b/src/net/udp/dns.c
@@ -506,7 +506,7 @@ static int dns_resolv ( struct resolv_interface *resolv,
 	ref_init ( &dns->refcnt, NULL );
 	resolv_init ( &dns->resolv, &null_resolv_ops, &dns->refcnt );
 	xfer_init ( &dns->socket, &dns_socket_operations, &dns->refcnt );
-	dns->timer.expired = dns_timer_expired;
+	timer_init ( &dns->timer, dns_timer_expired );
 	memcpy ( &dns->sa, sa, sizeof ( dns->sa ) );
 
 	/* Create query */
diff --git a/src/net/udp/slam.c b/src/net/udp/slam.c
index 3f0b0e2ea..a5a2421fa 100644
--- a/src/net/udp/slam.c
+++ b/src/net/udp/slam.c
@@ -753,8 +753,8 @@ static int slam_open ( struct xfer_interface *xfer, struct uri *uri ) {
 	xfer_init ( &slam->socket, &slam_socket_operations, &slam->refcnt );
 	xfer_init ( &slam->mc_socket, &slam_mc_socket_operations,
 		    &slam->refcnt );
-	slam->master_timer.expired = slam_master_timer_expired;
-	slam->slave_timer.expired = slam_slave_timer_expired;
+	timer_init ( &slam->master_timer, slam_master_timer_expired );
+	timer_init ( &slam->slave_timer, slam_slave_timer_expired );
 	/* Fake an invalid cached header of { 0x00, ... } */
 	slam->header_len = 1;
 	/* Fake parameters for initial NACK */
diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index 49c857fbf..5e98f58cd 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -1136,13 +1136,13 @@ static int tftp_core_open ( struct xfer_interface *xfer, struct uri *uri,
 		return -ENOMEM;
 	ref_init ( &tftp->refcnt, tftp_free );
 	xfer_init ( &tftp->xfer, &tftp_xfer_operations, &tftp->refcnt );
-	tftp->uri = uri_get ( uri );
 	xfer_init ( &tftp->socket, &tftp_socket_operations, &tftp->refcnt );
 	xfer_init ( &tftp->mc_socket, &tftp_mc_socket_operations,
 		    &tftp->refcnt );
+	timer_init ( &tftp->timer, tftp_timer_expired );
+	tftp->uri = uri_get ( uri );
 	tftp->blksize = TFTP_DEFAULT_BLKSIZE;
 	tftp->flags = flags;
-	tftp->timer.expired = tftp_timer_expired;
 
 	/* Open socket */
 	tftp->port = uri_port ( tftp->uri, default_port );