From f5b463702ec772161fbcf7cb65c4361f71abf435 Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Mon, 26 Sep 2016 05:52:21 +0530
Subject: [PATCH] Removed deprecated hipMallocHost

Change-Id: I3141fe05a34b6a306297a30721509965f49ccb97
---
 hipamd/include/hcc_detail/hip_runtime_api.h  | 23 +++++---------------
 hipamd/include/nvcc_detail/hip_runtime_api.h |  6 -----
 hipamd/src/hip_memory.cpp                    |  7 ------
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/hipamd/include/hcc_detail/hip_runtime_api.h b/hipamd/include/hcc_detail/hip_runtime_api.h
index 85c111e8bf..b266927a33 100644
--- a/hipamd/include/hcc_detail/hip_runtime_api.h
+++ b/hipamd/include/hcc_detail/hip_runtime_api.h
@@ -777,23 +777,10 @@ hipError_t hipPointerGetAttributes(hipPointerAttribute_t *attributes, void* ptr)
  *
  *  @return #hipSuccess
  *
- *  @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray, hipMallocHost, hipHostFree, hipHostAlloc
+ *  @see hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray, hipHostFree, hipHostMalloc
  */
 hipError_t hipMalloc(void** ptr, size_t size) ;
 
-
-/**
- *  @brief Allocate pinned host memory
- *
- *  @param[out] ptr Pointer to the allocated host pinned memory
- *  @param[in]  size Requested memory size
- *
- *  @return #hipSuccess, #hipErrorMemoryAllocation
- *
- *  @see hipMalloc, hipMallocPitch, hipMallocArray, hipMalloc3D, hipMalloc3DArray, hipHostAlloc, hipFree, hipFreeArray, hipMallocHost, hipHostFree, hipHostAlloc
- */
-hipError_t hipMallocHost(void** ptr, size_t size) __attribute__((deprecated("use hipHostMalloc instead"))) ;
-
 /**
  *  @brief Allocate device accessible page locked host memory
  *
@@ -803,7 +790,7 @@ hipError_t hipMallocHost(void** ptr, size_t size) __attribute__((deprecated("use
  *
  *  @return #hipSuccess, #hipErrorMemoryAllocation
  *
- *  @see hipSetDeviceFlags, hipMallocHost, hipHostFree
+ *  @see hipSetDeviceFlags, hipHostFree
  */
 hipError_t hipHostMalloc(void** ptr, size_t size, unsigned int flags) ;
 hipError_t hipHostAlloc(void** ptr, size_t size, unsigned int flags) __attribute__((deprecated("use hipHostMalloc instead"))) ;;
@@ -888,7 +875,7 @@ hipError_t hipHostUnregister(void* hostPtr) ;
  *  @param[in]  height Requested pitched allocation height
  *  @return Error code
  *
- *  @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipMallocHost, hipHostFree, hipMalloc3D, hipMalloc3DArray, hipHostAlloc
+ *  @see hipMalloc, hipFree, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D, hipMalloc3DArray, hipHostMalloc
  */
 
 hipError_t hipMallocPitch(void** ptr, size_t* pitch, size_t width, size_t height);
@@ -902,7 +889,7 @@ hipError_t hipMallocPitch(void** ptr, size_t* pitch, size_t width, size_t height
  *  @return #hipSuccess
  *  @return #hipErrorInvalidDevicePointer (if pointer is invalid, including host pointers allocated with hipHostMalloc)
  *
- *  @see hipMalloc, hipMallocPitch, hipMallocArray, hipFreeArray, hipMallocHost, hipHostFree, hipMalloc3D, hipMalloc3DArray, hipHostAlloc
+ *  @see hipMalloc, hipMallocPitch, hipMallocArray, hipFreeArray, hipHostFree, hipMalloc3D, hipMalloc3DArray, hipHostMalloc
  */
 hipError_t hipFree(void* ptr);
 
@@ -915,7 +902,7 @@ hipError_t hipFree(void* ptr);
  *  @return #hipSuccess,
  *          #hipErrorInvalidValue (if pointer is invalid, including device pointers allocated with hipMalloc)
  *
- *  @see hipMalloc, hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMallocHost, hipMalloc3D, hipMalloc3DArray, hipHostAlloc
+ *  @see hipMalloc, hipMallocPitch, hipFree, hipMallocArray, hipFreeArray, hipMalloc3D, hipMalloc3DArray, hipHostMalloc
  */
 hipError_t hipHostFree(void* ptr);
 
diff --git a/hipamd/include/nvcc_detail/hip_runtime_api.h b/hipamd/include/nvcc_detail/hip_runtime_api.h
index 9d5c8d8865..0814de8ec9 100644
--- a/hipamd/include/nvcc_detail/hip_runtime_api.h
+++ b/hipamd/include/nvcc_detail/hip_runtime_api.h
@@ -179,12 +179,6 @@ inline static hipError_t hipFree(void* ptr) {
     return hipCUDAErrorTohipError(cudaFree(ptr));
 }
 
-inline static hipError_t hipMallocHost(void** ptr, size_t size) __attribute__((deprecated("use hipHostMalloc instead")));
-
-inline static hipError_t hipMallocHost(void** ptr, size_t size) {
-    return hipCUDAErrorTohipError(cudaMallocHost(ptr, size));
-}
-
 inline static hipError_t hipHostMalloc(void** ptr, size_t size, unsigned int flags){
 	return hipCUDAErrorTohipError(cudaHostAlloc(ptr, size, flags));
 }
diff --git a/hipamd/src/hip_memory.cpp b/hipamd/src/hip_memory.cpp
index 6381cd5332..75097cd33b 100644
--- a/hipamd/src/hip_memory.cpp
+++ b/hipamd/src/hip_memory.cpp
@@ -179,13 +179,6 @@ hipError_t hipHostAlloc(void** ptr, size_t sizeBytes, unsigned int flags)
     return hipHostMalloc(ptr, sizeBytes, flags);
 };
 
-//---
-// TODO - remove me, this is deprecated.
-hipError_t hipMallocHost(void** ptr, size_t sizeBytes)
-{
-    return hipHostMalloc(ptr, sizeBytes, 0);
-}
-
 // width in bytes
 hipError_t hipMallocPitch(void** ptr, size_t* pitch, size_t width, size_t height) 
 {