diff --git a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.h b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.h --- a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.h +++ b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.h @@ -112,7 +112,6 @@ /// Actually move memory between host and device. See readGlobalFromDevice and /// writeGlobalToDevice for the interface description. Error moveGlobalBetweenDeviceAndHost(GenericDeviceTy &Device, - DeviceImageTy &Image, const GlobalTy &HostGlobal, const GlobalTy &DeviceGlobal, bool Device2Host); @@ -140,11 +139,10 @@ /// Copy the memory associated with a global from the device to its /// counterpart on the host. The name, size, and destination are defined by /// \p HostGlobal. The origin is defined by \p DeviceGlobal. - Error readGlobalFromDevice(GenericDeviceTy &Device, DeviceImageTy &Image, + Error readGlobalFromDevice(GenericDeviceTy &Device, const GlobalTy &HostGlobal, const GlobalTy &DeviceGlobal) { - return moveGlobalBetweenDeviceAndHost(Device, Image, HostGlobal, - DeviceGlobal, + return moveGlobalBetweenDeviceAndHost(Device, HostGlobal, DeviceGlobal, /* D2H */ true); } @@ -163,8 +161,7 @@ Error writeGlobalToDevice(GenericDeviceTy &Device, DeviceImageTy &Image, const GlobalTy &HostGlobal, const GlobalTy &DeviceGlobal) { - return moveGlobalBetweenDeviceAndHost(Device, Image, HostGlobal, - DeviceGlobal, + return moveGlobalBetweenDeviceAndHost(Device, HostGlobal, DeviceGlobal, /* D2H */ false); } diff --git a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.cpp b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.cpp --- a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.cpp +++ b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/GlobalHandler.cpp @@ -73,16 +73,15 @@ return Err; // Perform the actual transfer. - return moveGlobalBetweenDeviceAndHost(Device, Image, HostGlobal, DeviceGlobal, + return moveGlobalBetweenDeviceAndHost(Device, HostGlobal, DeviceGlobal, Device2Host); } /// Actually move memory between host and device. See readGlobalFromDevice and /// writeGlobalToDevice for the interface description. Error GenericGlobalHandlerTy::moveGlobalBetweenDeviceAndHost( - GenericDeviceTy &Device, DeviceImageTy &DeviceImage, - const GlobalTy &HostGlobal, const GlobalTy &DeviceGlobal, - bool Device2Host) { + GenericDeviceTy &Device, const GlobalTy &HostGlobal, + const GlobalTy &DeviceGlobal, bool Device2Host) { // Transfer the data from the source to the destination. if (Device2Host) {