The only drivers using this function are fbdev and glint. Though those driver
initialize with NULL argument. Other drivers do some kind of implicit probe
using fbdevHWInit instead.
API break.
Signed-off-by: Tiago Vignatti <tiago.vigna...@nokia.com>
---
I'll have to fix fbdev and glint accordingly then.
hw/xfree86/fbdevhw/fbdevhw.c | 7 ++-----
hw/xfree86/fbdevhw/fbdevhw.h | 2 +-
hw/xfree86/fbdevhw/fbdevhwstub.c | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index c8edc12..0041846 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -409,14 +409,11 @@ fbdev_open(int scrnIndex, char *dev, char** namep)
/* -------------------------------------------------------------------- */
Bool
-fbdevHWProbe(struct pci_device * pPci, char *device,char **namep)
+fbdevHWProbe(char *device,char **namep)
{
int fd;
- if (pPci)
- fd = fbdev_open_pci(pPci,namep);
- else
- fd = fbdev_open(-1,device,namep);
+ fd = fbdev_open(-1,device,namep);
if (-1 == fd)
return FALSE;
diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h
index bc46b9c..60d8985 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/hw/xfree86/fbdevhw/fbdevhw.h
@@ -18,7 +18,7 @@ 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 fbdevHWProbe(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..cc11680 100644
--- a/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -22,7 +22,7 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
Bool
-fbdevHWProbe(struct pci_device *pPci, char *device, char **namep)
+fbdevHWProbe(char *device, char **namep)
{
return FALSE;
}
--
1.7.1.226.g770c5
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
