From 5cc970a503122e5d9d466ba032d432d470d801aa Mon Sep 17 00:00:00 2001
From: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>
Date: Wed, 18 Aug 2021 21:12:39 +0000
Subject: [PATCH] Minor cleanups

Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>
---
 level_zero/core/source/event/event_impl.inl | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/level_zero/core/source/event/event_impl.inl b/level_zero/core/source/event/event_impl.inl
index 3c76726895..fbe0192347 100644
--- a/level_zero/core/source/event/event_impl.inl
+++ b/level_zero/core/source/event/event_impl.inl
@@ -103,7 +103,6 @@ template <typename TagSizeT>
 ze_result_t EventImp<TagSizeT>::queryStatus() {
     uint64_t *hostAddr = static_cast<uint64_t *>(hostAddress);
     uint32_t queryVal = Event::STATE_CLEARED;
-    ze_result_t retVal;
 
     if (metricStreamer != nullptr) {
         *hostAddr = metricStreamer->getNotificationState();
@@ -113,13 +112,7 @@ ze_result_t EventImp<TagSizeT>::queryStatus() {
         return queryStatusKernelTimestamp();
     }
     memcpy_s(static_cast<void *>(&queryVal), sizeof(uint32_t), static_cast<void *>(hostAddr), sizeof(uint32_t));
-    retVal = (queryVal == Event::STATE_CLEARED) ? ZE_RESULT_NOT_READY : ZE_RESULT_SUCCESS;
-
-    if (retVal == ZE_RESULT_NOT_READY) {
-        return retVal;
-    }
-
-    return retVal;
+    return (queryVal == Event::STATE_CLEARED) ? ZE_RESULT_NOT_READY : ZE_RESULT_SUCCESS;
 }
 
 template <typename TagSizeT>
@@ -138,7 +131,7 @@ ze_result_t EventImp<TagSizeT>::hostEventSetValueTimestamps(TagSizeT eventVal) {
     };
     for (uint32_t i = 0; i < kernelCount; i++) {
         uint32_t packetsToSet = kernelTimestampsData[i].getPacketsUsed();
-        for (uint32_t i = 0; i < packetsToSet; i++) {
+        for (uint32_t j = 0; j < packetsToSet; j++) {
             eventTsSetFunc(baseAddr + NEO::TimestampPackets<TagSizeT>::getContextStartOffset());
             eventTsSetFunc(baseAddr + NEO::TimestampPackets<TagSizeT>::getGlobalStartOffset());
             eventTsSetFunc(baseAddr + NEO::TimestampPackets<TagSizeT>::getContextEndOffset());