From 3cd7d33380953f2a315dd79ab74d7340c83fd80a Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 31 Mar 2015 09:06:46 +0200 Subject: [PATCH] randr: Remove senseless checks for xf86RandR12Key When xf86RandR12Key is not set we will not get to the places where these tests are done as the functions in question are not called. In most cases we would have crashed before these checks anyway. Signed-off-by: Egbert Eich Reviewed-by: Keith Packard --- hw/xfree86/modes/xf86RandR12.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index 0d446da64..eae701624 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -683,11 +683,9 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen, Bool ret = FALSE; int c; - if (xf86RandR12Key) { - if (randrp->virtualX == -1 || randrp->virtualY == -1) { - randrp->virtualX = pScrn->virtualX; - randrp->virtualY = pScrn->virtualY; - } + if (randrp->virtualX == -1 || randrp->virtualY == -1) { + randrp->virtualX = pScrn->virtualX; + randrp->virtualY = pScrn->virtualY; } if (pRoot && pScrn->vtSema) (*pScrn->EnableDisableFBAccess) (pScrn, FALSE); @@ -730,7 +728,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen, if (pRoot && pScrn->vtSema) (*pScrn->EnableDisableFBAccess) (pScrn, TRUE); #if RANDR_12_INTERFACE - if (xf86RandR12Key && pScreen->root && ret) + if (pScreen->root && ret) RRScreenSizeNotify(pScreen); #endif return ret; @@ -826,9 +824,6 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen) xf86RandR12ScreenSetSize(pScreen, width, height, mmWidth, mmHeight); } - if (xf86RandR12Key == NULL) - return TRUE; - if (randrp->virtualX == -1 || randrp->virtualY == -1) { randrp->virtualX = pScrn->virtualX; randrp->virtualY = pScrn->virtualY;