summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-11-18 12:13:46 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-11-18 12:50:44 +0000
commit0cb8544dc16d4c1e9ae7f1ee74ee26c7501a9ed7 (patch)
tree55357960064cd50d5579fcd47e069e4a3c4eb510
parent8509e474f57533fc6afcf213165f4c8633631fb5 (diff)
downloadxf86-video-intel-0cb8544dc16d4c1e9ae7f1ee74ee26c7501a9ed7.tar.gz
xf86-video-intel-0cb8544dc16d4c1e9ae7f1ee74ee26c7501a9ed7.tar.bz2
xf86-video-intel-0cb8544dc16d4c1e9ae7f1ee74ee26c7501a9ed7.zip
Remove useless indirection of intel_chipsets
Once upon a time this was used to hide a compiler warning about a pointer mismatch, now the compiler still warns about the cast, making the indirect moot. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/intel_module.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/intel_module.c b/src/intel_module.c
index ef62667f9..08c96962a 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -111,7 +111,7 @@ static const struct intel_device_info intel_haswell_info = {
.gen = 75,
};
-static const SymTabRec _intel_chipsets[] = {
+static const SymTabRec intel_chipsets[] = {
{PCI_CHIP_I810, "i810"},
{PCI_CHIP_I810_DC100, "i810-dc100"},
{PCI_CHIP_I810_E, "i810e"},
@@ -199,9 +199,7 @@ static const SymTabRec _intel_chipsets[] = {
{PCI_CHIP_VALLEYVIEW_PO, "ValleyView PO board" },
{-1, NULL}
};
-#define NUM_CHIPSETS (sizeof(_intel_chipsets) / sizeof(_intel_chipsets[0]))
-
-static SymTabRec *intel_chipsets = (SymTabRec *) _intel_chipsets;
+#define NUM_CHIPSETS (sizeof(intel_chipsets) / sizeof(intel_chipsets[0]))
#define INTEL_DEVICE_MATCH(d,i) \
{ 0x8086, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0x3 << 16, 0xff << 16, (intptr_t)(i) }