diff --git a/epicardium/modules/hw-lock.c b/epicardium/modules/hw-lock.c
index 47929fe06cf80c263168be59de1265aa5c87daec..529963e352edae97d8b377f5e3c7eb57ef4a47f7 100644
--- a/epicardium/modules/hw-lock.c
+++ b/epicardium/modules/hw-lock.c
@@ -37,40 +37,6 @@ int hwlock_acquire_nonblock(enum hwlock_periph p)
 	}
 }
 
-int hwlock_acquire_timeout(enum hwlock_periph p, TickType_t wait)
-{
-	assert(p < _HWLOCK_MAX);
-
-	/*
-	 * Check for code still defining a timeout.  It will be ignored in the
-	 * new implementation but a warning is emitted so someone hopefully
-	 * eventually fixes the offending code ...
-	 *
-	 * At some point, the signature of this function should be changed.
-	 * Alternatively it could be split into two, similar to the mutex API.
-	 */
-	if (wait != 0 && wait != portMAX_DELAY) {
-		LOG_WARN(
-			"hwlock",
-			"Attempting to lock %d with a timeout (from %p).",
-			p,
-			__builtin_return_address(0)
-		);
-	}
-
-	/* Non-blocking lock attempt */
-	if (wait == 0) {
-		if (mutex_trylock(&hwlock_mutex[p]) == true) {
-			return 0;
-		} else {
-			return -EBUSY;
-		}
-	}
-
-	mutex_lock(&hwlock_mutex[p]);
-	return 0;
-}
-
 void hwlock_release(enum hwlock_periph p)
 {
 	assert(p < _HWLOCK_MAX);
diff --git a/epicardium/modules/modules.h b/epicardium/modules/modules.h
index 0444b688f33cb879e3cca9f59cb1eb365999eb17..67557ad4f226aa6ad9a116aa0b940b09889ed2a2 100644
--- a/epicardium/modules/modules.h
+++ b/epicardium/modules/modules.h
@@ -97,7 +97,6 @@ enum hwlock_periph {
 	_HWLOCK_MAX,
 };
 
-int hwlock_acquire_timeout(enum hwlock_periph p, TickType_t wait);
 void hwlock_acquire(enum hwlock_periph p);
 int hwlock_acquire_nonblock(enum hwlock_periph p);
 void hwlock_release(enum hwlock_periph p);