diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c
index aa03891..e6751db 100644
--- a/openbsc/src/gprs/gprs_gmm.c
+++ b/openbsc/src/gprs/gprs_gmm.c
@@ -227,9 +227,7 @@
 	mm->num_T_exp = 0;
 
 	/* FIXME: we should do this only once ? */
-	mm->timer.data = mm;
-	mm->timer.cb = &mmctx_timer_cb;
-
+	osmo_timer_setup(&mm->timer, mmctx_timer_cb, mm);
 	osmo_timer_schedule(&mm->timer, seconds, 0);
 }
 
@@ -2167,9 +2165,7 @@
 	pdp->num_T_exp = 0;
 
 	/* FIXME: we should do this only once ? */
-	pdp->timer.data = pdp;
-	pdp->timer.cb = &pdpctx_timer_cb;
-
+	osmo_timer_setup(&pdp->timer, pdpctx_timer_cb, pdp);
 	osmo_timer_schedule(&pdp->timer, seconds, 0);
 }