diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index 469ce4c..cc897b1 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -314,7 +314,6 @@
 	unsigned char *data = __data;
 	int command, ret = 0;
 	u8 ackid;
-	uint64_t start = get_time_ns();
 
 	command = sp->variant->cmd.translate(data[0]);
 	if (command < 0)
@@ -334,12 +333,9 @@
 	 * is_timeout will implicitly poll serdev via poller
 	 * infrastructure
 	 */
-	while (!is_timeout(start, SECOND) && !reply.received)
-		;
-
-	if (!reply.received) {
+	ret = wait_on_timeout(SECOND, reply.received);
+	if (ret) {
 		dev_err(dev, "Command timeout\n");
-		ret = -ETIMEDOUT;
 		sp->reply = NULL;
 	}