From ad70dc676ebf8f2f86d171dccb873a04a3e5b87b Mon Sep 17 00:00:00 2001
From: Jon Smirl <jonsmirl@yahoo.com>
Date: Tue, 12 Oct 2004 03:59:17 +0000
Subject: Breakout heads into their own data structures.

---
 linux-core/i915_drv.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'linux-core/i915_drv.c')

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index 007c9b94..6cb27743 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -28,7 +28,7 @@ int postinit(struct drm_device *dev, unsigned long flags)
 		 DRIVER_MAJOR,
 		 DRIVER_MINOR,
 		 DRIVER_PATCHLEVEL,
-		 DRIVER_DATE, dev->minor, pci_pretty_name(dev->pdev)
+		 DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
 	    );
 	return 0;
 }
@@ -65,6 +65,7 @@ static drm_ioctl_desc_t ioctls[] = {
 	[DRM_IOCTL_NR(DRM_I915_CMDBUFFER)] = {i915_cmdbuffer, 1, 0}
 };
 
+static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
 	.driver_features =
 	    DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |
@@ -83,35 +84,34 @@ static struct drm_driver driver = {
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
 	.fops = {
-		 .owner = THIS_MODULE,
-		 .open = drm_open,
-		 .release = drm_release,
-		 .ioctl = drm_ioctl,
-		 .mmap = drm_mmap,
-		 .fasync = drm_fasync,
-		 },
+		.owner = THIS_MODULE,
+		.open = drm_open,
+		.release = drm_release,
+		.ioctl = drm_ioctl,
+		.mmap = drm_mmap,
+		.fasync = drm_fasync,
+		},
+	.pci_driver = {
+		.name = DRIVER_NAME,
+		.id_table = pciidlist,
+		.probe = probe,
+		.remove = __devexit_p(drm_cleanup_pci),
+		}
 };
 
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-	return drm_probe(pdev, ent, &driver);
+	return drm_get_dev(pdev, ent, &driver);
 }
 
-static struct pci_driver pci_driver = {
-	.name = DRIVER_NAME,
-	.id_table = pciidlist,
-	.probe = probe,
-	.remove = __devexit_p(drm_cleanup_pci),
-};
-
 static int __init i915_init(void)
 {
-	return drm_init(&pci_driver, pciidlist, &driver);
+	return drm_init(&driver, pciidlist);
 }
 
 static void __exit i915_exit(void)
 {
-	drm_exit(&pci_driver);
+	drm_exit(&driver);
 }
 
 module_init(i915_init);
-- 
cgit v1.2.3