Skip to contentSkip to conversation

fbdev: Remove i810fb explicit agp initialization hack.

PATCH New Andreas Henriksson 1 participant 1 message Sep 15, 2004 Agpgart driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbdev: Remove i810fb explicit agp initialization hack.

When Antonino A. Daplas posted his "fbdev: Initialize i810fb after agpgart" patch he said that the ugly agp initialization hack for intel agp shouldn't be needed but that he couldn't test it.

I have tested the framebuffer updates and additionally removed the initialization hack and it does indeed work.

drivers/char/agp/intel-agp.c renamed from drivers/char/agp/intel-agp.c.old +1 -9
@@ -1781,16 +1781,8 @@ static struct pci_driver agp_intel_pci_d
 	.resume		= agp_intel_resume,
 };
 
-/* intel_agp_init() must not be declared static for explicit
-   early initialization to work (ie i810fb) */
-int __init agp_intel_init(void)
+static int __init agp_intel_init(void)
 {
-	static int agp_initialised=0;
-
-	if (agp_initialised == 1)
-		return 0;
-	agp_initialised=1;
-
 	return pci_module_init(&agp_intel_pci_driver);
 }