diff options
Diffstat (limited to 'drivers/gpu/drm/r128')
-rw-r--r-- | drivers/gpu/drm/r128/r128_drv.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index 1e2971f13aa1..b9e8efd2b754 100644 --- a/drivers/gpu/drm/r128/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c | |||
@@ -56,8 +56,6 @@ static struct drm_driver driver = { | |||
56 | .irq_uninstall = r128_driver_irq_uninstall, | 56 | .irq_uninstall = r128_driver_irq_uninstall, |
57 | .irq_handler = r128_driver_irq_handler, | 57 | .irq_handler = r128_driver_irq_handler, |
58 | .reclaim_buffers = drm_core_reclaim_buffers, | 58 | .reclaim_buffers = drm_core_reclaim_buffers, |
59 | .get_map_ofs = drm_core_get_map_ofs, | ||
60 | .get_reg_ofs = drm_core_get_reg_ofs, | ||
61 | .ioctls = r128_ioctls, | 59 | .ioctls = r128_ioctls, |
62 | .dma_ioctl = r128_cce_buffers, | 60 | .dma_ioctl = r128_cce_buffers, |
63 | .fops = { | 61 | .fops = { |
@@ -71,11 +69,9 @@ static struct drm_driver driver = { | |||
71 | #ifdef CONFIG_COMPAT | 69 | #ifdef CONFIG_COMPAT |
72 | .compat_ioctl = r128_compat_ioctl, | 70 | .compat_ioctl = r128_compat_ioctl, |
73 | #endif | 71 | #endif |
72 | .llseek = noop_llseek, | ||
74 | }, | 73 | }, |
75 | .pci_driver = { | 74 | |
76 | .name = DRIVER_NAME, | ||
77 | .id_table = pciidlist, | ||
78 | }, | ||
79 | 75 | ||
80 | .name = DRIVER_NAME, | 76 | .name = DRIVER_NAME, |
81 | .desc = DRIVER_DESC, | 77 | .desc = DRIVER_DESC, |
@@ -90,16 +86,21 @@ int r128_driver_load(struct drm_device *dev, unsigned long flags) | |||
90 | return drm_vblank_init(dev, 1); | 86 | return drm_vblank_init(dev, 1); |
91 | } | 87 | } |
92 | 88 | ||
89 | static struct pci_driver r128_pci_driver = { | ||
90 | .name = DRIVER_NAME, | ||
91 | .id_table = pciidlist, | ||
92 | }; | ||
93 | |||
93 | static int __init r128_init(void) | 94 | static int __init r128_init(void) |
94 | { | 95 | { |
95 | driver.num_ioctls = r128_max_ioctl; | 96 | driver.num_ioctls = r128_max_ioctl; |
96 | 97 | ||
97 | return drm_init(&driver); | 98 | return drm_pci_init(&driver, &r128_pci_driver); |
98 | } | 99 | } |
99 | 100 | ||
100 | static void __exit r128_exit(void) | 101 | static void __exit r128_exit(void) |
101 | { | 102 | { |
102 | drm_exit(&driver); | 103 | drm_pci_exit(&driver, &r128_pci_driver); |
103 | } | 104 | } |
104 | 105 | ||
105 | module_init(r128_init); | 106 | module_init(r128_init); |