summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-23 23:00:25 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-07-23 23:00:25 +0100
commitc1785aaca2c9347114d28f114ee59ef8206d829b (patch)
tree2d096ef8335ab2de03e646631c7b05adfe72a895
parent554fce8a65b2518cae032f1eadf58830559299c8 (diff)
sna: Remove a surplus function
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_driver.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 3f7234f7..3bb23159 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -226,21 +226,6 @@ static void PreInitCleanup(ScrnInfoPtr scrn)
scrn->driverPrivate = NULL;
}
-static void sna_check_chipset_option(ScrnInfoPtr scrn)
-{
- struct sna *sna = to_sna(scrn);
-
- sna->info = intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);
-}
-
-static Bool sna_get_early_options(ScrnInfoPtr scrn)
-{
- struct sna *sna = to_sna(scrn);
-
- sna->Options = intel_options_get(scrn);
- return sna->Options != NULL;
-}
-
struct sna_device {
int fd;
int open_count;
@@ -449,7 +434,8 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
if (!xf86SetDefaultVisual(scrn, -1))
return FALSE;
- if (!sna_get_early_options(scrn))
+ sna->Options = intel_options_get(scrn);
+ if (sna->Options == NULL)
return FALSE;
sna->info = intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);