!688 platform code alarm cleaning

Merge pull request !688 from 张亚雷/master

model/storage/include/mmc/mmc_protocol.h

@@ -252,7 +252,7 @@ enum MmcRspCardStatus {
  * state change, it will be visible to the host in the response to the next command.
  * The four bits([12:9]) are interpreted as a binary coded number between 0 and 15.
  */
-#define MMC_CARD_CURRENT_STATE(x) ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
+#define MMC_CARD_CURRENT_STATE(x) (((x) & 0x00001E00) >> 9) /* sx, b (4 bits) */
 enum MmcCardCurrentState {
     STATE_IDLE = 0,
     STATE_READY = 1,

model/storage/src/mmc/mmc_if.c

@@ -37,7 +37,8 @@ static void *MmcCntlrObjGetByNumber(int16_t id)
     if (snprintf_s(serviceName, MMC_SVC_NAME_LEN + 1, MMC_SVC_NAME_LEN,
         "HDF_PLATFORM_MMC_%d", id) < 0) {
         HDF_LOGE("MmcCntlrObjGetByNumber: format service name fail!");
-        goto __ERR;
+        OsalMemFree(serviceName);
+        return object;
     }
 
 #ifdef __USER__
@@ -51,7 +52,6 @@ static void *MmcCntlrObjGetByNumber(int16_t id)
         HDF_LOGD("MmcCntlrObjGetByNumber: success");
     }
 
-__ERR:
     OsalMemFree(serviceName);
     return object;
 }

support/platform/src/hdmi/hdmi_event.c

@@ -100,7 +100,9 @@ static int32_t HdmiEventHotPlugHandleComm(struct HdmiCntlr *cntlr)
     if (cntlr->hdmi == NULL) {
         ret = HdmiCntlrAllocDev(cntlr);
         if (ret != HDF_SUCCESS) {
-            goto __END;
+            cntlr->event.plugged = false;
+            cntlr->event.hpdDetected = false;
+            return ret;
         }
         HDF_LOGE("HdmiEventHotPlugHandleComm HdmiCntlrAllocDev success.");
     }
@@ -109,23 +111,23 @@ static int32_t HdmiEventHotPlugHandleComm(struct HdmiCntlr *cntlr)
     if (HdmiEdidReset(&(cntlr->hdmi->edid)) != HDF_SUCCESS) {
         HDF_LOGE("edid reset fail.");
         ret = HDF_ERR_IO;
-        goto __END;
+        cntlr->event.plugged = false;
+        cntlr->event.hpdDetected = false;
+        return ret;
     }
     ret = HdmiEdidRawDataRead(&(cntlr->hdmi->edid), &(cntlr->ddc));
-    if (ret != HDF_SUCCESS) {
-        goto __END;
-    }
-    ret = HdmiEdidPhase(&(cntlr->hdmi->edid));
-    if (ret != HDF_SUCCESS) {
-        goto __END;
-    }
-
-__END:
     if (ret != HDF_SUCCESS) {
         cntlr->event.plugged = false;
         cntlr->event.hpdDetected = false;
         return ret;
     }
+    ret = HdmiEdidPhase(&(cntlr->hdmi->edid));
+    if (ret != HDF_SUCCESS) {
+        cntlr->event.plugged = false;
+        cntlr->event.hpdDetected = false;
+        return ret;
+    }
+
     cntlr->event.hpdDetected = true;
     if (cntlr->event.callback.callbackFunc != NULL) {
         cntlr->event.callback.callbackFunc(cntlr->event.callback.data, true);

support/platform/src/hdmi/hdmi_hdcp.c

@@ -388,7 +388,8 @@ static int32_t HdmiHdcpAuthentication(struct HdmiHdcp *hdcp)
     /* auth prepare, get aksv and driver clear registers. */
     ret = HdmiHdcpAuthenticationPrepare(hdcp);
     if (ret != HDF_SUCCESS) {
-        goto _END;
+        HdmiHdcpAuthenticationFail(hdcp);
+        return ret;
     }
 
     /*
@@ -396,12 +397,14 @@ static int32_t HdmiHdcpAuthentication(struct HdmiHdcp *hdcp)
      */
     ret = HdmiHdcpAuthenticationFirstPart(hdcp);
     if (ret != HDF_SUCCESS) {
-        goto _END;
+        HdmiHdcpAuthenticationFail(hdcp);
+        return ret;
     }
     HDF_LOGD("hdcp auth Part I success.");
     /* receiver (0), repeater (1) */
     if ((hdcp->bcaps & HDMI_HDCP_BCAPS_REPEATER_MARK) == 0) {
-        goto _END;
+        HdmiHdcpAuthenticationSucc(hdcp);
+        return ret;
     }
 
     /*
@@ -409,15 +412,11 @@ static int32_t HdmiHdcpAuthentication(struct HdmiHdcp *hdcp)
      */
     ret = HdmiHdcpAuthenticationSecondPart(hdcp);
     if (ret != HDF_SUCCESS) {
-        goto _END;
+        HdmiHdcpAuthenticationFail(hdcp);
+        return ret;
     }
 
-_END:
-    if (ret == HDF_SUCCESS) {
-        HdmiHdcpAuthenticationSucc(hdcp);
-    } else {
-        HdmiHdcpAuthenticationFail(hdcp);
-    }
+    HdmiHdcpAuthenticationSucc(hdcp);
     return ret;
 }
 
@@ -444,17 +443,18 @@ int32_t HdmiHdcpOpen(struct HdmiHdcp *hdcp)
     ret = HdmiHdcpAuthentication(hdcp);
     if (ret == HDF_SUCCESS) {
         HDF_LOGD("hdcp Authentication success!");
-        goto __END;
+        (void)OsalMutexUnlock(&(hdcp->hdcpMutex));
+        return ret;
     }
 
     while (hdcp->authRetryCnt <= HDMI_HDCP_AUTH_MAX_RETRY_CNT) {
         ret = HdmiHdcpAuthenticationRetry(hdcp);
         if (ret == HDF_SUCCESS) {
-            goto __END;
+            (void)OsalMutexUnlock(&(hdcp->hdcpMutex));
+            return ret;
         }
         hdcp->authRetryCnt++;
     }
- __END :
     (void)OsalMutexUnlock(&(hdcp->hdcpMutex));
     return ret;
 }

support/platform/src/hdmi/hdmi_hdr.c

@@ -203,7 +203,6 @@ int32_t HdmiHdrAttrHandle(struct HdmiHdr *hdr, struct HdmiHdrAttr *curAttr)
         HDF_LOGD("hdr attr not change");
         return HDF_SUCCESS;
     }
-
     if (oldAttr->colorimetry != curAttr->colorimetry) {
         HdmiHdrColorimetryUpdate(&(cntlr->attr.videoAttr), curAttr->colorimetry);
     }
@@ -213,7 +212,10 @@ int32_t HdmiHdrAttrHandle(struct HdmiHdr *hdr, struct HdmiHdrAttr *curAttr)
         if (HdmiDisableHdr(cntlr, curAttr) == HDF_SUCCESS) {
             commAttr->vsifDolby = false;
             cntlr->attr.hdrAttr = *curAttr;
-            goto _SEND_INFOFRAME;
+            (void)HdmiAviInfoFrameSend(&(cntlr->infoFrame), (commAttr->enableHdmi && commAttr->avi));
+            (void)HdmiVsInfoFrameSend(&(cntlr->infoFrame), commAttr->enableHdmi, commAttr->vsifDolby);
+            HdmiCntlrVideoPathSet(cntlr, &(cntlr->attr.videoAttr));
+            return ret;
         } else {
             return HDF_FAILURE;
         }
@@ -226,8 +228,6 @@ int32_t HdmiHdrAttrHandle(struct HdmiHdr *hdr, struct HdmiHdrAttr *curAttr)
         return ret;
     }
     (void)HdmiDrmInfoFrameSend(&(cntlr->infoFrame), (commAttr->enableHdmi && commAttr->drm));
-
-_SEND_INFOFRAME:
     (void)HdmiAviInfoFrameSend(&(cntlr->infoFrame), (commAttr->enableHdmi && commAttr->avi));
     (void)HdmiVsInfoFrameSend(&(cntlr->infoFrame), commAttr->enableHdmi, commAttr->vsifDolby);
     HdmiCntlrVideoPathSet(cntlr, &(cntlr->attr.videoAttr));

support/platform/src/hdmi/hdmi_if.c

@@ -416,14 +416,14 @@ static void *HdmiCntlrObjGet(uint16_t busNum)
     if (snprintf_s(serviceName, (HDMI_SERVICE_NAME_LEN + 1),
         HDMI_SERVICE_NAME_LEN, "HDF_PLATFORM_HDMI_%u", busNum) < 0) {
         HDF_LOGE("get HDMI service name fail.");
-        goto __ERR;
+        OsalMemFree(serviceName);
+        return obj;
     }
 #ifdef __USER__
     obj = (void *)HdfIoServiceBind(serviceName);
 #else
     obj = (void *)HdmiCntlrGetByBusNum(busNum);
 #endif
-__ERR:
     OsalMemFree(serviceName);
     return obj;
 }

support/platform/src/i2c/i2c_core.c

@@ -317,12 +317,14 @@ static int32_t I2cManagerIoTransfer(struct HdfSBuf *data, struct HdfSBuf *reply)
 
     ret = I2cCntlrTransfer(I2cManagerFindCntlr(number), msgs, count);
     if (ret != count) {
-        goto __EXIT__;
+        if (bufReply != NULL) {
+            OsalMemFree(bufReply);
+        }
+        return ret;
     }
 
     ret = I2cTransferWriteBackMsgs(reply, msgs, count);
 
-__EXIT__:
     if (bufReply != NULL) {
         OsalMemFree(bufReply);
     }

test/unittest/platform/common/adc_test.c

@@ -272,7 +272,8 @@ int32_t AdcTestExecute(int cmd)
     if (cmd > ADC_TEST_CMD_MAX) {
         HDF_LOGE("%s: invalid cmd:%d", __func__, cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -283,7 +284,6 @@ int32_t AdcTestExecute(int cmd)
         break;
     }
 
-__EXIT__:
     HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
     return ret;
 }

test/unittest/platform/common/dac_test.c

@@ -280,7 +280,8 @@ int32_t DacTestExecute(int cmd)
     if (cmd > DAC_TEST_CMD_MAX) {
         HDF_LOGE("%s: invalid cmd:%d", __func__, cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -291,7 +292,6 @@ int32_t DacTestExecute(int cmd)
         break;
     }
 
-__EXIT__:
     HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
     return ret;
 }

test/unittest/platform/common/gpio_test.c

@@ -164,7 +164,6 @@ static int32_t GpioTestSetGetDir(void)
     dirSet = GPIO_DIR_OUT;
     dirGet = GPIO_DIR_IN;
 
-SET_GET_DIR:
     ret = GpioSetDir(tester->cfg.gpio, dirSet);
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: set dir fail! ret:%d", __func__, ret);
@@ -180,10 +179,21 @@ SET_GET_DIR:
         return HDF_FAILURE;
     }
     /* change the value and test one more time */
-    if (dirSet == GPIO_DIR_OUT) {
-        dirSet = GPIO_DIR_IN;
-        dirGet = GPIO_DIR_OUT;
-        goto SET_GET_DIR;
+    dirSet = GPIO_DIR_IN;
+    dirGet = GPIO_DIR_OUT;
+    ret = GpioSetDir(tester->cfg.gpio, dirSet);
+    if (ret != HDF_SUCCESS) {
+        HDF_LOGE("%s: set dir fail! ret:%d", __func__, ret);
+        return ret;
+    }
+    ret = GpioGetDir(tester->cfg.gpio, &dirGet);
+    if (ret != HDF_SUCCESS) {
+        HDF_LOGE("%s: get dir fail! ret:%d", __func__, ret);
+        return ret;
+    }
+    if (dirSet != dirGet) {
+        HDF_LOGE("%s: set dir:%u, but get:%u", __func__, dirSet, dirGet);
+        return HDF_FAILURE;
     }
     return HDF_SUCCESS;
 }
@@ -209,7 +219,6 @@ static int32_t GpioTestWriteRead(void)
     valWrite = GPIO_VAL_LOW;
     valRead = GPIO_VAL_HIGH;
 
-WRITE_READ_VAL:
     ret = GpioWrite(tester->cfg.gpio, valWrite);
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: write val:%u fail! ret:%d", __func__, valWrite, ret);
@@ -225,10 +234,21 @@ WRITE_READ_VAL:
         return HDF_FAILURE;
     }
     /* change the value and test one more time */
-    if (valWrite == GPIO_VAL_HIGH) {
-        valWrite = GPIO_VAL_HIGH;
-        valRead = GPIO_VAL_LOW;
-        goto WRITE_READ_VAL;
+    valWrite = GPIO_VAL_HIGH;
+    valRead = GPIO_VAL_LOW;
+    ret = GpioWrite(tester->cfg.gpio, valWrite);
+    if (ret != HDF_SUCCESS) {
+        HDF_LOGE("%s: write val:%u fail! ret:%d", __func__, valWrite, ret);
+        return ret;
+    }
+    ret = GpioRead(tester->cfg.gpio, &valRead);
+    if (ret != HDF_SUCCESS) {
+        HDF_LOGE("%s: read fail! ret:%d", __func__, ret);
+        return ret;
+    }
+    if (valWrite != valRead) {
+        HDF_LOGE("%s: write:%u, but get:%u", __func__, valWrite, valRead);
+        return HDF_FAILURE;
     }
     return HDF_SUCCESS;
 }

test/unittest/platform/common/i2c_test.c

@@ -378,7 +378,8 @@ int32_t I2cTestExecute(int cmd)
     if (cmd > I2C_TEST_CMD_MAX) {
         HDF_LOGE("I2cTestExecute: invalid cmd:%d", cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        HDF_LOGE("[I2cTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -389,7 +390,6 @@ int32_t I2cTestExecute(int cmd)
         break;
     }
 
-__EXIT__:
     HDF_LOGE("[I2cTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
     return ret;
 }

test/unittest/platform/common/i3c_test.c

@@ -498,7 +498,8 @@ int32_t I3cTestExecute(int cmd)
     if (cmd > I3C_TEST_CMD_MAX) {
         HDF_LOGE("%s: invalid cmd:%d", __func__, cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        HDF_LOGI("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -510,7 +511,6 @@ int32_t I3cTestExecute(int cmd)
         break;
     }
 
-__EXIT__:
     HDF_LOGI("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
     return ret;
 }

test/unittest/platform/common/pin_test.c

@@ -336,7 +336,8 @@ int32_t PinTestExecute(int cmd)
     if (cmd > PIN_TEST_CMD_MAX) {
         HDF_LOGE("%s: invalid cmd:%d", __func__, cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -347,7 +348,6 @@ int32_t PinTestExecute(int cmd)
         break;
     }
 
-__EXIT__:
     HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
     return ret;
 }

test/unittest/platform/common/platform_device_test.c

@@ -287,7 +287,8 @@ int PlatformDeviceTestExecute(int cmd)
     if (cmd > PLAT_DEVICE_TEST_CMD_MAX) {
         PLAT_LOGE("PlatformDeviceTestExecute: invalid cmd:%d", cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        PLAT_LOGE("[PlatformDeviceTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < (sizeof(g_entry) / sizeof(g_entry[0])); i++) {
@@ -311,7 +312,6 @@ int PlatformDeviceTestExecute(int cmd)
     ret = entry->func(&device);
     PlatformDeviceUninit(&device);
 
-__EXIT__:
     PLAT_LOGE("[PlatformDeviceTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
     return ret;
 }

test/unittest/platform/common/platform_event_test.c

@@ -205,7 +205,8 @@ int PlatformEventTestExecute(int cmd)
     if (cmd > PLAT_EVENT_TEST_CMD_MAX) {
         PLAT_LOGE("PlatformEventTestExecute: invalid cmd:%d", cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        PLAT_LOGE("[PlatformEventTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -229,7 +230,6 @@ int PlatformEventTestExecute(int cmd)
     ret = entry->func(&pe);
     PlatformEventUninit(&pe);
 
-__EXIT__:
     PLAT_LOGE("[PlatformEventTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
     return ret;
 }

test/unittest/platform/common/platform_manager_test.c

@@ -241,7 +241,8 @@ int PlatformManagerTestExecute(int cmd)
     if (cmd > PLAT_MANAGER_TEST_CMD_MAX) {
         PLAT_LOGE("PlatformManagerTestExecute: invalid cmd:%d", cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        PLAT_LOGE("[PlatformManagerTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -274,7 +275,6 @@ int PlatformManagerTestExecute(int cmd)
     PlatformManagerDestroy(manager);
     PlatformManagerTestDestroyDevices();
 
-__EXIT__:
     PLAT_LOGE("[PlatformManagerTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
     return ret;
 }

test/unittest/platform/common/platform_queue_test.c

@@ -123,7 +123,8 @@ int PlatformQueueTestExecute(int cmd)
     if (cmd > PLAT_QUEUE_TEST_CMD_MAX) {
         PLAT_LOGE("PlatformQueueTestExecute: invalid cmd:%d", cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        PLAT_LOGE("[PlatformQueueTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -155,7 +156,6 @@ int PlatformQueueTestExecute(int cmd)
     ret = entry->func(pq);
     PlatformQueueDestroy(pq);
 
-__EXIT__:
     PLAT_LOGE("[PlatformQueueTestExecute][======cmd:%d====ret:%d======]", cmd, ret);
     return ret;
 }

test/unittest/platform/common/pwm_test.c

@@ -390,7 +390,9 @@ int32_t PwmTestExecute(int cmd)
         ret = PwmGetConfig(tester->handle, &(tester->originCfg));
         if (ret != HDF_SUCCESS) {
             HDF_LOGE("%s: [PwmGetConfig] failed, ret %d.", __func__, ret);
-            goto __EXIT__;
+            HDF_LOGI("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
+            PwmTesterPut(tester);
+            return ret;
         }
     }
 
@@ -407,7 +409,6 @@ int32_t PwmTestExecute(int cmd)
         PwmSetConfig(tester->handle, &(tester->originCfg));
     }
 
-__EXIT__:
     HDF_LOGI("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
     PwmTesterPut(tester);
     return ret;

test/unittest/platform/common/uart_test.c

@@ -314,7 +314,9 @@ int32_t UartTestExecute(int cmd)
     if (cmd > UART_TEST_CMD_MAX) {
         HDF_LOGE("%s: invalid cmd:%d", __func__, cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
+        UartTesterPut(tester);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -325,7 +327,6 @@ int32_t UartTestExecute(int cmd)
         break;
     }
 
-__EXIT__:
     HDF_LOGE("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
     UartTesterPut(tester);
     return ret;

test/unittest/platform/common/watchdog_test.c

@@ -310,7 +310,9 @@ int32_t WatchdogTestExecute(int cmd)
     if (cmd > WATCHDOG_TEST_MAX) {
         HDF_LOGE("%s: invalid cmd:%d", __func__, cmd);
         ret = HDF_ERR_NOT_SUPPORT;
-        goto __EXIT__;
+        HDF_LOGI("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
+        WatchdogTesterPut(tester);
+        return ret;
     }
 
     for (i = 0; i < sizeof(g_entry) / sizeof(g_entry[0]); i++) {
@@ -322,7 +324,6 @@ int32_t WatchdogTestExecute(int cmd)
         break;
     }
 
-__EXIT__:
     HDF_LOGI("[%s][======cmd:%d====ret:%d======]", __func__, cmd, ret);
     WatchdogTesterPut(tester);
     return ret;

test/unittest/platform/virtual/dac_virtual.c

@@ -99,7 +99,9 @@ static int32_t VirtualDacParseAndInit(struct HdfDeviceObject *device, const stru
     ret = VirtualDacReadDrs(virtual, node);
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: Read drs fail! ret:%d", __func__, ret);
-        goto __ERR__;
+        OsalMemFree(virtual);
+        virtual = NULL;
+        return ret;
     }
 
     VirtualDacDeviceInit(virtual);
@@ -109,17 +111,12 @@ static int32_t VirtualDacParseAndInit(struct HdfDeviceObject *device, const stru
     ret = DacDeviceAdd(&virtual->device);
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: add Dac controller failed! ret = %d", __func__, ret);
-        goto __ERR__;
+        OsalMemFree(virtual);
+        virtual = NULL;
+        return ret;
     }
 
     return HDF_SUCCESS;
-__ERR__:
-    if (virtual != NULL) {
-        OsalMemFree(virtual);
-        virtual = NULL;
-    }
-
-    return ret;
 }
 
 static int32_t VirtualDacInit(struct HdfDeviceObject *device)

test/unittest/platform/virtual/i3c_virtual.c

@@ -349,7 +349,9 @@ static int32_t VirtualI3cParseAndInit(struct HdfDeviceObject *device, const stru
     ret = VirtualI3cReadDrs(virtual, node);
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: Read drs fail! ret:%d", __func__, ret);
-        goto __ERR__;
+        OsalMemFree(virtual);
+        virtual = NULL;
+        return ret;
     }
 
     VirtualI3cCntlrInit(virtual);
@@ -361,17 +363,12 @@ static int32_t VirtualI3cParseAndInit(struct HdfDeviceObject *device, const stru
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: add i3c controller failed! ret = %d", __func__, ret);
         (void)OsalSpinDestroy(&virtual->spin);
-        goto __ERR__;
+        OsalMemFree(virtual);
+        virtual = NULL;
+        return ret;
     }
 
     return HDF_SUCCESS;
-__ERR__:
-    if (virtual != NULL) {
-        OsalMemFree(virtual);
-        virtual = NULL;
-    }
-
-    return ret;
 }
 
 static int32_t VirtualI3cInit(struct HdfDeviceObject *device)

test/unittest/platform/virtual/regulator_virtual.c

@@ -237,7 +237,11 @@ static int32_t VirtualRegulatorParseAndInit(struct HdfDeviceObject *device, cons
     ret = VirtualRegulatorReadHcs(regNode, node);
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: read drs fail! ret:%d", __func__, ret);
-        goto __ERR__;
+        if (regNode != NULL) {
+            OsalMemFree(regNode);
+            regNode = NULL;
+        }
+        return ret;
     }
     
     regNode->priv = (void *)node;
@@ -246,17 +250,13 @@ static int32_t VirtualRegulatorParseAndInit(struct HdfDeviceObject *device, cons
     ret = RegulatorNodeAdd(regNode);
     if (ret != HDF_SUCCESS) {
         HDF_LOGE("%s: add regulator controller fail:%d!", __func__, ret);
-        goto __ERR__;
+        if (regNode != NULL) {
+            OsalMemFree(regNode);
+            regNode = NULL;
+        }
+        return ret;
     }
     return HDF_SUCCESS;
-
-__ERR__:
-    HDF_LOGE("%s:fail ret:%d", __func__, ret);
-    if (regNode != NULL) {
-        OsalMemFree(regNode);
-        regNode = NULL;
-    }
-    return ret;
 }
 
 static int32_t VirtualRegulatorInit(struct HdfDeviceObject *device)