From 6b306f43384e5c2143197e746a5a39c4ebb2583c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 5 Jun 2010 20:58:04 -0700 Subject: [PATCH] kdrive: Xv code uses shared screen private instead of kdrive-specific private When doing the devPrivate API conversion, I missed this as there was also a local private key which wasn't ever used. Reviewed-by: Jamey Sharp Signed-off-by: Keith Packard --- hw/kdrive/src/kxv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 24ae89eac..3af6acfb2 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -105,8 +105,7 @@ static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int); static DevPrivateKeyRec KdXVWindowKeyRec; #define KdXVWindowKey (&KdXVWindowKeyRec) -static DevPrivateKeyRec KdXvScreenKeyRec; -#define KdXvScreenKey (&KdXvScreenKeyRec) +static DevPrivateKey KdXvScreenKey; static unsigned long KdXVGeneration = 0; static unsigned long PortResource = 0; @@ -202,9 +201,6 @@ KdXVScreenInit( if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0)) return FALSE; - if (!dixRegisterPrivateKey(&KdXVScreenKeyRec, PRIVATE_SCREEN, 0)) - return FALSE; - if(Success != (*XvScreenInitProc)(pScreen)) return FALSE; KdXvScreenKey = (*XvGetScreenKeyProc)();