SWDEV-306939 - Fix vdi errors/warnings by CppCheck

Change-Id: I56d910f8363787f1050d5d7e8064ed553c5827fd

rocclr/device/pal/palvirtual.cpp

@@ -624,13 +624,13 @@ void VirtualGPU::MemoryDependency::validate(VirtualGPU& gpu, const Memory* memor
 
 void VirtualGPU::MemoryDependency::clear(bool all) {
   if (numMemObjectsInQueue_ > 0) {
-    size_t i, j;
     if (all) {
       endMemObjectsInQueue_ = numMemObjectsInQueue_;
     }
 
     // If the current launch didn't start from the beginning, then move the data
     if (0 != endMemObjectsInQueue_) {
+      size_t i, j;
       // Preserve all objects from the current kernel
       for (i = 0, j = endMemObjectsInQueue_; j < numMemObjectsInQueue_; i++, j++) {
         memObjectsInQueue_[i].start_ = memObjectsInQueue_[j].start_;
@@ -2553,8 +2553,7 @@ bool VirtualGPU::submitKernelInternal(const amd::NDRangeContainer& sizes, const
     Pal::DispatchAqlParams dispatchParam = {};
     dispatchParam.pAqlPacket = aqlPkt;
     if (hsaKernel.workGroupInfo()->scratchRegs_ > 0) {
-      const Device::ScratchBuffer* scratch = nullptr;
-      scratch = dev().scratch(hwRing());
+      const Device::ScratchBuffer* scratch = dev().scratch(hwRing());
       dispatchParam.scratchAddr = scratch->memObj_->vmAddress();
       dispatchParam.scratchSize = scratch->size_;
       dispatchParam.scratchOffset = scratch->offset_;
@@ -3640,8 +3639,7 @@ void VirtualGPU::buildKernelInfo(const HSAILKernel& hsaKernel, hsa_kernel_dispat
     kernelInfo.scratchBufferSizeInBytes = scratchBuf->size();
 
     // Get the address of the scratch buffer and its size for CPU access
-    address scratchRingAddr = nullptr;
-    scratchRingAddr = static_cast<address>(scratchBuf->map(nullptr, 0));
+    address scratchRingAddr = static_cast<address>(scratchBuf->map(nullptr, 0));
     dbgManager->setScratchRing(scratchRingAddr, scratchBuf->size());
     scratchBuf->unmap(nullptr);
   } else {