diff options
| author | Dave Airlie <airlied@gmail.com> | 2010-12-15 03:16:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-07 13:09:36 +1000 |
| commit | 8410ea3b95d105a5be5db501656f44bbb91197c1 (patch) | |
| tree | 6cd27f207e50c13ba2f4a78d6323bc23f751e380 /drivers/gpu/drm/tdfx | |
| parent | ff72145badb834e8051719ea66e024784d000cb4 (diff) | |
| download | op-kernel-dev-8410ea3b95d105a5be5db501656f44bbb91197c1.zip op-kernel-dev-8410ea3b95d105a5be5db501656f44bbb91197c1.tar.gz | |
drm: rework PCI/platform driver interface.
This abstracts the pci/platform interface out a step further,
we can go further but this is far enough for now to allow USB
to be plugged in.
The drivers now just call the init code directly for their
device type.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/tdfx')
| -rw-r--r-- | drivers/gpu/drm/tdfx/tdfx_drv.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c index b70fa91..8bf9881 100644 --- a/drivers/gpu/drm/tdfx/tdfx_drv.c +++ b/drivers/gpu/drm/tdfx/tdfx_drv.c @@ -52,10 +52,6 @@ static struct drm_driver driver = { .fasync = drm_fasync, .llseek = noop_llseek, }, - .pci_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, - }, .name = DRIVER_NAME, .desc = DRIVER_DESC, @@ -65,14 +61,19 @@ static struct drm_driver driver = { .patchlevel = DRIVER_PATCHLEVEL, }; +static struct pci_driver tdfx_pci_driver = { + .name = DRIVER_NAME, + .id_table = pciidlist, +}; + static int __init tdfx_init(void) { - return drm_init(&driver); + return drm_pci_init(&driver, &tdfx_pci_driver); } static void __exit tdfx_exit(void) { - drm_exit(&driver); + drm_pci_exit(&driver, &tdfx_pci_driver); } module_init(tdfx_init); |
