Revert "Make driver init() function optional"

2 files changed, 4 insertions, 5 deletions

diff --git a/src/device/usbd.c b/src/device/usbd.c
index c7f511eac..42903576c 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -572,10 +572,9 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
   // Init class drivers
   for (uint8_t i = 0; i < TOTAL_DRIVER_COUNT; i++) {
     usbd_class_driver_t const* driver = get_driver(i);
-    if (driver && driver->init) {
-      TU_LOG_USBD("%s init\r\n", driver->name);
-      driver->init();
-    }
+    TU_ASSERT(driver && driver->init);
+    TU_LOG_USBD("%s init\r\n", driver->name);
+    driver->init();
   }
 
   _usbd_rhport = rhport;
diff --git a/src/host/usbh.c b/src/host/usbh.c
index f65a3a427..75df6bf60 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -544,7 +544,7 @@ bool tuh_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
     // Class drivers
     for (uint8_t drv_id = 0; drv_id < TOTAL_DRIVER_COUNT; drv_id++) {
       usbh_class_driver_t const* driver = get_driver(drv_id);
-      if (driver && driver->init) {
+      if (driver != NULL) {
         TU_LOG_USBH("%s init\r\n", driver->name);
         driver->init();
       }