diff options
Diffstat (limited to 'linux-core/tdfx_drv.c')
-rw-r--r-- | linux-core/tdfx_drv.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index 488bbcb4..66d57284 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -43,7 +43,7 @@ static 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 struct pci_device_id pciidlist[] = { tdfx_PCI_IDS }; +static int probe(struct pci_dev *pdev, const struct pci_device_id *ent); static struct drm_driver driver = { .driver_features = DRIVER_USE_MTRR, .reclaim_buffers = drm_core_reclaim_buffers, @@ -73,35 +74,35 @@ static struct drm_driver driver = { .postinit = postinit, .version = version, .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 tdfx_init(void) { - return drm_init(&pci_driver, pciidlist, &driver); + return drm_init(&driver, pciidlist); } static void __exit tdfx_exit(void) { - drm_exit(&pci_driver); + drm_exit(&driver); } module_init(tdfx_init); |