diff --git a/distributed_camera/hdi_service/include/utils/anonymous_string.h b/distributed_camera/hdi_service/include/utils/anonymous_string.h
index 8cbfaaaa59bd85db986c8a23da870941f4c5e016..655df293df7510d6904c74fcc47eb408b13a7996 100644
--- a/distributed_camera/hdi_service/include/utils/anonymous_string.h
+++ b/distributed_camera/hdi_service/include/utils/anonymous_string.h
@@ -21,7 +21,6 @@
 namespace OHOS {
 namespace DistributedHardware {
 std::string GetAnonyString(const std::string &value);
-std::string GetAnonyInt32(const int32_t value);
 } // namespace DistributedHardware
 } // namespace OHOS
 #endif // OHOS_DISTRIBUTED_CAMERA_ANONYMOUS_STRING_H
diff --git a/distributed_camera/hdi_service/include/utils/dcamera.h b/distributed_camera/hdi_service/include/utils/dcamera.h
index 9798789c22f35c37ab8b522fb02ba0deec3ec4f3..3d78b62b921058c04638f762443e493420b72585 100644
--- a/distributed_camera/hdi_service/include/utils/dcamera.h
+++ b/distributed_camera/hdi_service/include/utils/dcamera.h
@@ -33,8 +33,6 @@ const std::string BASE_64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrs
 
 CamRetCode MapToExternalRetCode(DCamRetCode retCode);
 
-DCamRetCode MapToInternalRetCode(CamRetCode retCode);
-
 uint64_t GetCurrentLocalTimeStamp();
 
 void SplitString(const std::string &str, std::vector<std::string> &tokens, const std::string &delimiters);
diff --git a/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp b/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp
index f727496e274157858916ee91d9249bf1158d924a..fc036e6847828e00759180cb53e424eaa1b7ec92 100644
--- a/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp
+++ b/distributed_camera/hdi_service/src/dcamera_device/dcamera_device.cpp
@@ -282,7 +282,7 @@ CamRetCode DCameraDevice::OpenDCamera(const OHOS::sptr<ICameraDeviceCallback> &c
         return CamRetCode::DEVICE_ERROR;
     }
     {
-        unique_lock<mutex> lock(isOpenSessFailedlock_);
+        unique_lock<mutex> openStateLock(isOpenSessFailedlock_);
         if (isOpenSessFailed_) {
             DHLOGE("Open distributed camera session failed.");
             return CamRetCode::DEVICE_ERROR;
diff --git a/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp b/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp
index f0552f23224a0320a093672189c4ee53d3c6ec09..e20695fddd93b29aba3b48b11371cbba9fdf75d7 100644
--- a/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp
+++ b/distributed_camera/hdi_service/src/dcamera_host/dcamera_host.cpp
@@ -90,7 +90,7 @@ int32_t DCameraHost::GetCameraAbility(const std::string &cameraId, std::vector<u
         constexpr uint32_t WIDTH_OFFSET = 1;
         constexpr uint32_t HEIGHT_OFFSET = 2;
         constexpr uint32_t UNIT_LENGTH = 3;
-        int32_t ret = OHOS::Camera::FindCameraMetadataItem(ability->get(),
+        ret = OHOS::Camera::FindCameraMetadataItem(ability->get(),
             OHOS_ABILITY_STREAM_AVAILABLE_BASIC_CONFIGURATIONS, &item);
         DHLOGI("FindCameraMetadataItem item=%u, count=%u, dataType=%u", item.item, item.count, item.data_type);
         if (ret != CAM_META_SUCCESS) {
diff --git a/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp b/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp
index 11f8fe13e72ee79dac8cdd5633a14ce93e841d8e..555429d92a8b951d1b9ee0396a9630c709a6629a 100644
--- a/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp
+++ b/distributed_camera/hdi_service/src/dstream_operator/dcamera_stream.cpp
@@ -54,7 +54,7 @@ DCamRetCode DCameraStream::InitDCameraStream(const StreamInfo &info)
 
     DCamRetCode ret = DCamRetCode::SUCCESS;
     if (dcStreamInfo_->bufferQueue_ != nullptr) {
-        DCamRetCode ret = InitDCameraBufferManager();
+        ret = InitDCameraBufferManager();
         if (ret != DCamRetCode::SUCCESS) {
             DHLOGE("Cannot init buffer manager.");
         }
diff --git a/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp b/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp
index 68dd15cf48423a4567539f8c8e36028297a244b9..d4a24baf49c4a24f29c0b6b0ba0476c8fce277bd 100644
--- a/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp
+++ b/distributed_camera/hdi_service/src/dstream_operator/dstream_operator.cpp
@@ -155,9 +155,7 @@ int32_t DStreamOperator::CommitStreams(OperationMode mode, const std::vector<uin
         return CamRetCode::CAMERA_BUSY;
     }
 
-    if (currentOperMode_ != mode) {
-        currentOperMode_ = mode;
-    }
+    currentOperMode_ = mode;
 
     std::shared_ptr<OHOS::Camera::CameraMetadata> setting = nullptr;
     OHOS::Camera::MetadataUtils::ConvertVecToMetadata(modeSetting, setting);
diff --git a/distributed_camera/hdi_service/src/utils/anonymous_string.cpp b/distributed_camera/hdi_service/src/utils/anonymous_string.cpp
index b6cfa82d2b2b478b8119021bc5a1ee3fcfbe7aa2..e8e989d9c8bba616c8e90a3d0b4ed218e6c4c705 100644
--- a/distributed_camera/hdi_service/src/utils/anonymous_string.cpp
+++ b/distributed_camera/hdi_service/src/utils/anonymous_string.cpp
@@ -43,26 +43,5 @@ std::string GetAnonyString(const std::string &value)
 
     return res;
 }
-
-std::string GetAnonyInt32(const int32_t value)
-{
-    constexpr int32_t INT32_STRING_LENGTH = 40;
-    char tempBuffer[INT32_STRING_LENGTH] = "";
-    int32_t secRet = sprintf_s(tempBuffer, INT32_STRING_LENGTH, "%d", value);
-    if (secRet <= 0) {
-        std::string nullString("");
-        return nullString;
-    }
-    size_t length = strlen(tempBuffer);
-    for (size_t i = 1; i <= length - 1; i++) {
-        tempBuffer[i] = '*';
-    }
-    if (length == 0x01) {
-        tempBuffer[0] = '*';
-    }
-
-    std::string tempString(tempBuffer);
-    return tempString;
-}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/distributed_camera/hdi_service/src/utils/dcamera.cpp b/distributed_camera/hdi_service/src/utils/dcamera.cpp
index b8e31f6dee1ca313382bdcf11a422b23c12dea30..7694dcd6bbb84eea760794032f78e1769e491eb4 100644
--- a/distributed_camera/hdi_service/src/utils/dcamera.cpp
+++ b/distributed_camera/hdi_service/src/utils/dcamera.cpp
@@ -54,29 +54,6 @@ CamRetCode MapToExternalRetCode(DCamRetCode retCode)
     return CamRetCode::DEVICE_ERROR;
 }
 
-DCamRetCode MapToInternalRetCode(CamRetCode retCode)
-{
-    switch (retCode) {
-        case CamRetCode::NO_ERROR:
-            return DCamRetCode::SUCCESS;
-        case CamRetCode::CAMERA_BUSY:
-            return DCamRetCode::CAMERA_BUSY;
-        case CamRetCode::INSUFFICIENT_RESOURCES:
-            return DCamRetCode::EXCEED_MAX_NUMBER;
-        case CamRetCode::INVALID_ARGUMENT:
-            return DCamRetCode::INVALID_ARGUMENT;
-        case CamRetCode::METHOD_NOT_SUPPORTED:
-            return DCamRetCode::METHOD_NOT_SUPPORTED;
-        case CamRetCode::CAMERA_CLOSED:
-            return DCamRetCode::CAMERA_OFFLINE;
-        case CamRetCode::DEVICE_ERROR:
-            return DCamRetCode::FAILED;
-        default:
-            break;
-    }
-    return DCamRetCode::FAILED;
-}
-
 uint64_t GetCurrentLocalTimeStamp()
 {
     std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds> tp =