[PATCH 3/4] xfree86: fbdevhw: remove probe function
Tiago Vignatti
tiago.vignatti at nokia.com
Fri Sep 10 07:26:52 PDT 2010
pciaccess based drivers do implicit probe using fbdevHWInit instead.
API break.
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
hw/xfree86/fbdevhw/fbdevhw.c | 18 ------------------
hw/xfree86/fbdevhw/fbdevhw.h | 1 -
hw/xfree86/fbdevhw/fbdevhwstub.c | 7 -------
3 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index f50d562..a758f63 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -403,24 +403,6 @@ fbdev_open(int scrnIndex, char *dev, char** namep)
return fd;
}
-/* -------------------------------------------------------------------- */
-
-Bool
-fbdevHWProbe(struct pci_device * pPci, char *device,char **namep)
-{
- int fd;
-
- if (pPci)
- fd = fbdev_open_pci(pPci,namep);
- else
- fd = fbdev_open(-1,device,namep);
-
- if (-1 == fd)
- return FALSE;
- close(fd);
- return TRUE;
-}
-
Bool
fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device)
{
diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h
index bc46b9c..5e4b110 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/hw/xfree86/fbdevhw/fbdevhw.h
@@ -18,7 +18,6 @@ extern _X_EXPORT void fbdevHWFreeRec(ScrnInfoPtr pScrn);
extern _X_EXPORT int fbdevHWGetFD(ScrnInfoPtr pScrn);
-extern _X_EXPORT Bool fbdevHWProbe(struct pci_device * pPci, char *device, char **namep);
extern _X_EXPORT Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device);
extern _X_EXPORT char* fbdevHWGetName(ScrnInfoPtr pScrn);
diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c
index 191a6d3..cb5d4b7 100644
--- a/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -20,13 +20,6 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
{
}
-
-Bool
-fbdevHWProbe(struct pci_device *pPci, char *device, char **namep)
-{
- return FALSE;
-}
-
Bool
fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device)
{
--
1.7.1.226.g770c5
More information about the xorg-devel
mailing list