diff --git a/helpers.c b/helpers.c
index 40077df1afe79f9ecaef47577142a58023b9099f..f32d392856259ad18c38799933867c8a3f43c6c1 100644
--- a/helpers.c
+++ b/helpers.c
@@ -159,7 +159,8 @@ EXPORT_SYMBOL(zio_arm_trigger);
  */
 void zio_trigger_data_done(struct zio_cset *cset)
 {
-	int self_timed = zio_cset_is_self_timed(cset);
+	int self_timed = cset->flags & ZIO_CSET_SELF_TIMED;
+
 	unsigned long flags;
 
 	spin_lock_irqsave(&cset->lock, flags);
diff --git a/include/linux/zio.h b/include/linux/zio.h
index f478d5e872a743386571f8997baebd2fbe1d1dbe..f5a6e4b18c4da61535e95de183b58a6678a85b96 100644
--- a/include/linux/zio.h
+++ b/include/linux/zio.h
@@ -212,7 +212,7 @@ enum zio_cset_flags {
 };
 
 /* Check the flags so we know whether to arm immediately or not */
-static inline int zio_cset_is_self_timed(struct zio_cset *cset)
+static inline int zio_cset_early_arm(struct zio_cset *cset)
 {
 	unsigned long flags = cset->flags;
 
diff --git a/objects.c b/objects.c
index bb7ce638d6f89fc5b3f0d429698c0a9a4a6a8f26..f09568d1fa23b91f9978f9482a6df9eb86283c97 100644
--- a/objects.c
+++ b/objects.c
@@ -331,7 +331,7 @@ int zio_change_current_trigger(struct zio_cset *cset, char *name)
 	spin_unlock_irqrestore(&cset->lock, flags);
 
 	/* Finally, arm it if so needed */
-	if (zio_cset_is_self_timed(cset))
+	if (zio_cset_early_arm(cset))
 		zio_arm_trigger(ti);
 
 	return 0;
@@ -434,7 +434,7 @@ int zio_change_current_buffer(struct zio_cset *cset, char *name)
 	spin_unlock_irqrestore(&cset->lock, flags);
 
 	/* Finally, arm the trigger if so needed */
-	if (zio_cset_is_self_timed(cset))
+	if (zio_cset_early_arm(cset))
 		zio_arm_trigger(ti);
 
 	return 0;
@@ -775,7 +775,7 @@ static int cset_register(struct zio_cset *cset, struct zio_cset *cset_t)
 	ti->flags &= ~ZIO_DISABLED;
 	spin_unlock_irqrestore(&cset->lock, flags);
 
-	if (zio_cset_is_self_timed(cset))
+	if (zio_cset_early_arm(cset))
 		zio_arm_trigger(ti);
 
 	return 0;
diff --git a/triggers/zio-trig-user.c b/triggers/zio-trig-user.c
index 4d65537bafdddf8cc9a036a27ec77ac975e49e0d..964958951d50d201367903295da42fae0dc94096 100644
--- a/triggers/zio-trig-user.c
+++ b/triggers/zio-trig-user.c
@@ -56,7 +56,7 @@ static void ztu_pull_block(struct zio_ti *ti, struct zio_channel *chan)
 	pr_debug("%s:%d\n", __func__, __LINE__);
 
 	/* For self-timed devices, we have no pull, as it's already armed */
-	if (zio_cset_is_self_timed(ti->cset))
+	if (zio_cset_early_arm(ti->cset))
 		return;
 	/* Otherwise, the user sets the input timing by reading */
 	getnstimeofday(&ti->tstamp);