summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-04-20 22:28:36 +0300
committerAlon Levy <alevy@redhat.com>2011-04-20 23:35:10 +0300
commit705ce538e8cbd108edf2fc20afbb88c1e7a4c285 (patch)
tree8dacc5907fbaf7872b83c89dfc41c4324f46f806
parentfddf513fedd6bb47e15d2436d82b5c194563b00c (diff)
s/FreeSurface/FreeSurfaceinfo/
-rw-r--r--display/driver.c2
-rw-r--r--display/res.c2
-rw-r--r--display/surface.c2
-rw-r--r--display/surface.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/display/driver.c b/display/driver.c
index 7e6941a..ab56360 100644
--- a/display/driver.c
+++ b/display/driver.c
@@ -1274,7 +1274,7 @@ HBITMAP APIENTRY DrvCreateDeviceBitmap(DHPDEV dhpdev, SIZEL size, ULONG format)
// to optimize the failure case
out_error2:
- FreeSurface(pdev, surface_id);
+ FreeSurfaceInfo(pdev, surface_id);
out_error:
return 0;
}
diff --git a/display/res.c b/display/res.c
index b0e8481..01e434d 100644
--- a/display/res.c
+++ b/display/res.c
@@ -752,7 +752,7 @@ static void FreeDelSurface(PDev *pdev, Resource *res)
default:
PANIC(pdev, "bad allocation type");
}
- FreeSurface(pdev, internal->surface_id);
+ FreeSurfaceInfo(pdev, internal->surface_id);
FreeMem(pdev, MSPACE_TYPE_DEVRAM, res);
DEBUG_PRINT((pdev, 13, "%s: done\n", __FUNCTION__));
diff --git a/display/surface.c b/display/surface.c
index 3f088a5..0ac57f2 100644
--- a/display/surface.c
+++ b/display/surface.c
@@ -165,7 +165,7 @@ HBITMAP CreateDeviceBitmap(PDev *pdev, SIZEL size, ULONG format, QXLPHYSICAL *ph
out_error3:
QXLDelSurface(pdev, *base_mem, allocation_type);
out_error2:
- FreeSurface(pdev, surface_id);
+ FreeSurfaceInfo(pdev, surface_id);
EngDeleteSurface((HSURF)surf);
out_error1:
return 0;
diff --git a/display/surface.h b/display/surface.h
index f810e8c..be7435a 100644
--- a/display/surface.h
+++ b/display/surface.h
@@ -33,7 +33,7 @@ static _inline UINT32 GetSurfaceId(SURFOBJ *surf)
return GetSurfaceIdFromInfo(surface);
}
-static _inline void FreeSurface(PDev *pdev, UINT32 surface_id)
+static _inline void FreeSurfaceInfo(PDev *pdev, UINT32 surface_id)
{
SurfaceInfo *surface;