[PATCH] vmware: drop infoFromScreen inline in favour of new interface

[Dave Airlie]

From: Dave Airlie <airlied at redhat.com>

This also should fix the build regression introduced with the fix
for this macro.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/vmware.h      |    6 ------
 src/vmwarecurs.c  |   17 +++++++++--------
 src/vmwarevideo.c |    5 +++--
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/vmware.h b/src/vmware.h
index be113bb..028dff3 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -18,8 +18,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
-#include "compat-api.h"
-
 #include <X11/extensions/panoramiXproto.h>
 
 #ifdef XSERVER_LIBPCIACCESS
@@ -177,10 +175,6 @@ typedef struct {
 
 #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
 
-static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
-    return xf86ScreenToScrn(s);
-}
-
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #define ABS(x) (((x) >= 0) ? (x) : -(x))
diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
index 2e2effb..93dacc0 100644
--- a/src/vmwarecurs.c
+++ b/src/vmwarecurs.c
@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] =
 #endif
 
 #include "vmware.h"
+#include "vmware_common.h"
 #include "bits2pixels.h"
 
 static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
 static Bool
 vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
     VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n",
               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src )
 static Bool
 vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs)
 {
-    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
     VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n",
               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
@@ -283,7 +284,7 @@ Bool
 vmwareCursorInit(ScreenPtr pScreen)
 {
     xf86CursorInfoPtr infoPtr;
-    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
     Bool ret;
 
     TRACEPOINT
@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen)
 void
 vmwareCursorCloseScreen(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
 #ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen)
 void
 vmwareCursorHookWrappers(ScreenPtr pScreen)
 {
-    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
 #ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
 #endif
@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
                unsigned int format, unsigned long planeMask, char *pBinImage)
 {
     ScreenPtr pScreen = src->pScreen;
-    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen));
+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen));
     BoxRec box;
     Bool hidden = FALSE;
     
@@ -412,7 +413,7 @@ static void
 VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
-    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen));
+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen));
     BoxPtr pBB;
     Bool hidden = FALSE;
     
@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
 		CARD16 width, CARD16 height)
 {
     ScreenPtr pScreen = pDst->pDrawable->pScreen;
-    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
     PictureScreenPtr ps = GetPictureScreen(pScreen);
     BoxRec box;
     Bool hidden = FALSE;
diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
index 71f21fe..745c71f 100644
--- a/src/vmwarevideo.c
+++ b/src/vmwarevideo.c
@@ -39,6 +39,7 @@
 #endif
 
 #include "vmware.h"
+#include "vmware_common.h"
 #include "xf86xv.h"
 #include "fourcc.h"
 #include "svga_escape.h"
@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE)
 Bool
 vmwareVideoInit(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL;
     XF86VideoAdaptorPtr newAdaptor = NULL;
     int numAdaptors;
@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen)
 void
 vmwareVideoEnd(ScreenPtr pScreen)
 {
-    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
     VMWAREVideoPtr pVid;
     int i;
-- 
1.7.10.2