diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c
index 38a165dbf924179f9fa0f2d805485a250c166ba5..47df99dbaef4e392a0db73b9f660d48e3152e758 100644
--- a/drivers/usb/gadget/udc/snps_udc_core.c
+++ b/drivers/usb/gadget/udc/snps_udc_core.c
@@ -3207,13 +3207,9 @@ int udc_probe(struct udc *dev)
 		goto finished;
 
 	/* timer init */
-	init_timer(&udc_timer);
-	udc_timer.function = udc_timer_function;
-	udc_timer.data = 1;
+	setup_timer(&udc_timer, udc_timer_function, 1);
 	/* timer pollstall init */
-	init_timer(&udc_pollstall_timer);
-	udc_pollstall_timer.function = udc_pollstall_timer_function;
-	udc_pollstall_timer.data = 1;
+	setup_timer(&udc_pollstall_timer, udc_pollstall_timer_function, 1);
 
 	/* set SD */
 	reg = readl(&dev->regs->ctl);