[PATCH fbdev driver] fbdevhw: remove probe

Tiago Vignatti tiago.vignatti at nokia.com
Fri Sep 10 07:26:54 PDT 2010


it's done in init time already.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 src/fbdev.c |   39 +++++++++++++++++----------------------
 1 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/fbdev.c b/src/fbdev.c
index c97ce1c..2e7f2db 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -248,28 +248,23 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
 						  pScrn->entityInstanceList[0]);
 
 	device = xf86FindOptionValue(devSection->options, "fbdev");
-	if (fbdevHWProbe(NULL, device, NULL)) {
-	    pScrn->driverVersion = FBDEV_VERSION;
-	    pScrn->driverName    = FBDEV_DRIVER_NAME;
-	    pScrn->name          = FBDEV_NAME;
-	    pScrn->Probe         = FBDevProbe;
-	    pScrn->PreInit       = FBDevPreInit;
-	    pScrn->ScreenInit    = FBDevScreenInit;
-	    pScrn->SwitchMode    = fbdevHWSwitchModeWeak();
-	    pScrn->AdjustFrame   = fbdevHWAdjustFrameWeak();
-	    pScrn->EnterVT       = fbdevHWEnterVTWeak();
-	    pScrn->LeaveVT       = fbdevHWLeaveVTWeak();
-	    pScrn->ValidMode     = fbdevHWValidModeWeak();
-
-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-		       "claimed PCI slot %d@%d:%d:%d\n", 
-		       dev->bus, dev->domain, dev->dev, dev->func);
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		       "using %s\n", device ? device : "default device");
-	}
-	else {
-	    pScrn = NULL;
-	}
+	pScrn->driverVersion = FBDEV_VERSION;
+	pScrn->driverName    = FBDEV_DRIVER_NAME;
+	pScrn->name          = FBDEV_NAME;
+	pScrn->Probe         = FBDevProbe;
+	pScrn->PreInit       = FBDevPreInit;
+	pScrn->ScreenInit    = FBDevScreenInit;
+	pScrn->SwitchMode    = fbdevHWSwitchModeWeak();
+	pScrn->AdjustFrame   = fbdevHWAdjustFrameWeak();
+	pScrn->EnterVT       = fbdevHWEnterVTWeak();
+	pScrn->LeaveVT       = fbdevHWLeaveVTWeak();
+	pScrn->ValidMode     = fbdevHWValidModeWeak();
+
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+	       "claimed PCI slot %d@%d:%d:%d\n", 
+	       dev->bus, dev->domain, dev->dev, dev->func);
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	       "using %s\n", device ? device : "default device");
     }
 
     return (pScrn != NULL);
-- 
1.7.1.226.g770c5



More information about the xorg-devel mailing list