commit b5b904c9b07fad71519a1ed65178493263b2fe04
author Naseer Ahmed <naseer@codeaurora.org> Tue Apr 16 10:39:02 2013 -0400
committer Naseer Ahmed <naseer@codeaurora.org> Tue Apr 16 13:00:17 2013 -0400
tree 2e7bf9b2c5d57608bd0d26fa151ebfb7c4ae6246
parent e7ff13f8bde798c3ce190d7d34748a69c8605baa

gralloc: Cleanup usage of old API

All builds have now moved to the new ION API.

Change-Id: Ic5ed7aa40231be64c715d6bb0d00a022db3fb863

libgralloc/ionalloc.cpp

diff --git a/libgralloc/ionalloc.cpp b/libgralloc/ionalloc.cpp
index 83e62e7..46c7cb8 100644
--- a/libgralloc/ionalloc.cpp
+++ b/libgralloc/ionalloc.cpp
@@ -40,9 +40,6 @@
 using gralloc::IonAlloc;
 
 #define ION_DEVICE "/dev/ion"
-#ifdef QCOM_BSP
-#define NEW_ION_API
-#endif
 
 int IonAlloc::open_device()
 {
@@ -69,10 +66,6 @@
 {
     Locker::Autolock _l(mLock);
     int err = 0;
-#ifndef NEW_ION_API
-    int ionSyncFd = FD_INIT;
-    int iFd = FD_INIT;
-#endif
     struct ion_handle_data handle_data;
     struct ion_fd_data fd_data;
     struct ion_allocation_data ionAllocData;
@@ -80,46 +73,19 @@
 
     ionAllocData.len = data.size;
     ionAllocData.align = data.align;
-#ifndef NEW_ION_API
-    ionAllocData.flags = data.flags;
-#else
     ionAllocData.heap_mask = data.flags & ~ION_SECURE;
     ionAllocData.flags = data.uncached ? 0 : ION_FLAG_CACHED;
     // ToDo: replace usage of alloc data structure with
     //  ionallocdata structure.
     if (data.flags & ION_SECURE)
         ionAllocData.flags |= ION_SECURE;
-#endif
 
     err = open_device();
     if (err)
         return err;
-#ifndef NEW_ION_API
-    if(data.uncached) {
-        // Use the sync FD to alloc and map 93
-        // when we need uncached memory 94
-        ionSyncFd = open(ION_DEVICE, O_RDONLY|O_DSYNC);
-        if(ionSyncFd < 0) {
-            ALOGE("%s: Failed to open ion device - %s",
-                  __FUNCTION__, strerror(errno));
-            return -errno;
-        }
-        iFd = ionSyncFd;
-    } else {
-        iFd = mIonFd;
-    }
-
-    if(ioctl(iFd, ION_IOC_ALLOC, &ionAllocData)) {
-#else
     if(ioctl(mIonFd, ION_IOC_ALLOC, &ionAllocData)) {
-#endif
         err = -errno;
         ALOGE("ION_IOC_ALLOC failed with error - %s", strerror(errno));
-#ifndef NEW_ION_API
-        if(ionSyncFd >= 0)
-            close(ionSyncFd);
-        ionSyncFd = FD_INIT;
-#endif
         return err;
     }
 
@@ -236,7 +202,6 @@
     flush_data.offset  = offset;
     flush_data.length  = size;
 
-#ifdef NEW_ION_API
     struct ion_custom_data d;
     switch(op) {
     case CACHE_CLEAN:
@@ -253,9 +218,6 @@
     d.arg = (unsigned long int)&flush_data;
 
     if(ioctl(mIonFd, ION_IOC_CUSTOM, &d)) {
-#else
-    if(ioctl(mIonFd, ION_IOC_CLEAN_INV_CACHES, &flush_data)) {
-#endif
         err = -errno;
         ALOGE("%s: ION_IOC_CLEAN_INV_CACHES failed with error - %s",