diff options
| author | Jon Smirl <jonsmirl@yahoo.com> | 2004-10-10 22:54:55 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@yahoo.com> | 2004-10-10 22:54:55 +0000 |
| commit | ad549c5ae62fd75aa2bdb8bf5efc4913c476cb02 (patch) | |
| tree | 8501388508ca7005b8401427448d01dd12a3c0b7 /linux-core/drm_stub.c | |
| parent | 3f02a793514a866401119efc74c20512f4732703 (diff) | |
Rename fn_tbl to driver. Core driver now uses pci_driver name which
reflects the personality name.
Diffstat (limited to 'linux-core/drm_stub.c')
| -rw-r--r-- | linux-core/drm_stub.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c index ed4cd19b..03327839 100644 --- a/linux-core/drm_stub.c +++ b/linux-core/drm_stub.c @@ -54,7 +54,7 @@ struct proc_dir_entry *drm_proc_root; static int fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, const struct pci_device_id *ent, - struct drm_driver_fn *driver_fn) + struct drm_driver *driver) { int retcode; @@ -63,7 +63,6 @@ static int fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, sema_init(&dev->struct_sem, 1); sema_init(&dev->ctxlist_sem, 1); - dev->name = DRIVER_NAME; dev->pdev = pdev; #ifdef __alpha__ @@ -91,10 +90,10 @@ static int fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, dev->types[4] = _DRM_STAT_LOCKS; dev->types[5] = _DRM_STAT_UNLOCKS; - dev->fn_tbl = driver_fn; + dev->driver = driver; - if (dev->fn_tbl->preinit) - if ((retcode = dev->fn_tbl->preinit(dev, ent->driver_data))) + if (dev->driver->preinit) + if ((retcode = dev->driver->preinit(dev, ent->driver_data))) goto error_out_unreg; if (drm_core_has_AGP(dev)) { @@ -125,7 +124,7 @@ static int fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, /* postinit is a required function to display the signon banner */ /* drivers add secondary heads here if needed */ - if ((retcode = dev->fn_tbl->postinit(dev, ent->driver_data))) + if ((retcode = dev->driver->postinit(dev, ent->driver_data))) goto error_out_unreg; return 0; @@ -147,7 +146,7 @@ static int fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, * Try and register, if we fail to register, backout previous work. */ int drm_probe(struct pci_dev *pdev, const struct pci_device_id *ent, - struct drm_driver_fn *driver_fn) + struct drm_driver *driver) { struct class_device *dev_class; drm_device_t *dev; @@ -173,7 +172,7 @@ int drm_probe(struct pci_dev *pdev, const struct pci_device_id *ent, pci_request_regions(pdev, DRIVER_NAME); pci_enable_device(pdev); } - if ((ret = fill_in_dev(dev, pdev, ent, driver_fn))) { + if ((ret = fill_in_dev(dev, pdev, ent, driver))) { printk(KERN_ERR "DRM: Fill_in_dev failed.\n"); goto err_g1; } |