diff --git a/drivers/usb/dwc3/dwc3-msm-core.c b/drivers/usb/dwc3/dwc3-msm-core.c
index 5d302e872b0f..8d70fec99959 100644
--- a/drivers/usb/dwc3/dwc3-msm-core.c
+++ b/drivers/usb/dwc3/dwc3-msm-core.c
@@ -3175,15 +3175,6 @@ static int is_diag_enabled(struct usb_composite_dev *cdev)
 	return 0;
 }
 
-static int dwc3_device_core_soft_reset(struct dwc3_msm *mdwc)
-{
-	struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);
-
-	dwc3_msm_notify_event(dwc, DWC3_GSI_EVT_BUF_SETUP, 0);
-
-	return 0;
-}
-
 static void dwc3_msm_update_imem_pid(struct dwc3 *dwc)
 {
 	struct usb_composite_dev	*cdev = NULL;
@@ -3443,9 +3434,6 @@ void dwc3_msm_notify_event(struct dwc3 *dwc,
 	case DWC3_IMEM_UPDATE_PID:
 		dwc3_msm_update_imem_pid(dwc);
 		break;
-	case DWC3_CONTROLLER_SOFT_RESET:
-		dwc3_device_core_soft_reset(mdwc);
-		break;
 	default:
 		dev_dbg(mdwc->dev, "unknown dwc3 event\n");
 		break;
diff --git a/drivers/usb/dwc3/dwc3-msm-ops.c b/drivers/usb/dwc3/dwc3-msm-ops.c
index 83da8d91893a..23cc9eb893e2 100644
--- a/drivers/usb/dwc3/dwc3-msm-ops.c
+++ b/drivers/usb/dwc3/dwc3-msm-ops.c
@@ -135,7 +135,11 @@ static int entry___dwc3_gadget_start(struct kretprobe_instance *ri,
 {
 	struct dwc3 *dwc = (struct dwc3 *)regs->regs[0];
 
-	dwc3_msm_notify_event(dwc, DWC3_CONTROLLER_SOFT_RESET, 0);
+	/*
+	 * Setup USB GSI event buffer as controller soft reset has cleared
+	 * configured event buffer.
+	 */
+	dwc3_msm_notify_event(dwc, DWC3_GSI_EVT_BUF_SETUP, 0);
 
 	return 0;
 }
diff --git a/include/linux/usb/dwc3-msm.h b/include/linux/usb/dwc3-msm.h
index 79046e1ebb9c..ee76735f04bb 100644
--- a/include/linux/usb/dwc3-msm.h
+++ b/include/linux/usb/dwc3-msm.h
@@ -77,7 +77,6 @@ enum dwc3_notify_event {
 	DWC3_CONTROLLER_NOTIFY_DISABLE_UPDXFER,
 	DWC3_CONTROLLER_PULLUP_ENTER,
 	DWC3_CONTROLLER_PULLUP_EXIT,
-	DWC3_CONTROLLER_SOFT_RESET,
 
 	/* USB GSI event buffer related notification */
 	DWC3_GSI_EVT_BUF_ALLOC,