Address review feedback

Author: Fábio Mestre

source/adapters/cuda/common.hpp

@@ -12,16 +12,6 @@
 #include <cuda.h>
 #include <ur/ur.hpp>
 
-/**
- * Call a UR API and, if the result is not UR_RESULT_SUCCESS, automatically
- * return from the current function.
- */
-#define UR_RETURN_ON_FAILURE(urCall)                                           \
-  if (const ur_result_t ur_result_macro = urCall;                              \
-      ur_result_macro != UR_RESULT_SUCCESS) {                                  \
-    return ur_result_macro;                                                    \
-  }
-
 ur_result_t mapErrorUR(CUresult Result);
 
 /// Converts CUDA error into UR error codes, and outputs error information

source/adapters/cuda/memory.cpp

@@ -475,7 +475,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemImageGetInfo(ur_mem_handle_t hMemory,
     switch (propName) {
     case UR_IMAGE_INFO_FORMAT:
       ur_image_channel_type_t ChannelType;
-      UR_RETURN_ON_FAILURE(cuda2urFormat(ArrayInfo.Format, &ChannelType));
+      UR_CHECK_ERROR(cuda2urFormat(ArrayInfo.Format, &ChannelType));
       return ReturnValue(
           ur_image_format_t{UR_IMAGE_CHANNEL_ORDER_RGBA, ChannelType});
     case UR_IMAGE_INFO_WIDTH:
@@ -486,7 +486,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemImageGetInfo(ur_mem_handle_t hMemory,
       return ReturnValue(ArrayInfo.Depth);
     case UR_IMAGE_INFO_ELEMENT_SIZE:
       size_t Size;
-      UR_RETURN_ON_FAILURE(cudaFormatToElementSize(ArrayInfo.Format, &Size));
+      UR_CHECK_ERROR(cudaFormatToElementSize(ArrayInfo.Format, &Size));
       return ReturnValue(Size);
     case UR_IMAGE_INFO_ROW_PITCH:
     case UR_IMAGE_INFO_SLICE_PITCH: