diff options
| author | Dave Airlie <airlied@gmail.com> | 2010-12-14 20:16:38 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-07 06:09:36 +0300 |
| commit | 8410ea3b95d105a5be5db501656f44bbb91197c1 (patch) | |
| tree | 6cd27f207e50c13ba2f4a78d6323bc23f751e380 /drivers/gpu/drm/r128 | |
| parent | ff72145badb834e8051719ea66e024784d000cb4 (diff) | |
| download | linux-8410ea3b95d105a5be5db501656f44bbb91197c1.tar.xz | |
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/r128')
| -rw-r--r-- | drivers/gpu/drm/r128/r128_drv.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index 18c3c71e41b1..b9e8efd2b754 100644 --- a/drivers/gpu/drm/r128/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c @@ -71,10 +71,7 @@ static struct drm_driver driver = { #endif .llseek = noop_llseek, }, - .pci_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, - }, + .name = DRIVER_NAME, .desc = DRIVER_DESC, @@ -89,16 +86,21 @@ int r128_driver_load(struct drm_device *dev, unsigned long flags) return drm_vblank_init(dev, 1); } +static struct pci_driver r128_pci_driver = { + .name = DRIVER_NAME, + .id_table = pciidlist, +}; + static int __init r128_init(void) { driver.num_ioctls = r128_max_ioctl; - return drm_init(&driver); + return drm_pci_init(&driver, &r128_pci_driver); } static void __exit r128_exit(void) { - drm_exit(&driver); + drm_pci_exit(&driver, &r128_pci_driver); } module_init(r128_init); |