diff options
Diffstat (limited to 'drivers/char/drm/savage_drv.c')
-rw-r--r-- | drivers/char/drm/savage_drv.c | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/drivers/char/drm/savage_drv.c b/drivers/char/drm/savage_drv.c index ac8d270427ca..22d799cde41c 100644 --- a/drivers/char/drm/savage_drv.c +++ b/drivers/char/drm/savage_drv.c | |||
@@ -30,30 +30,28 @@ | |||
30 | 30 | ||
31 | #include "drm_pciids.h" | 31 | #include "drm_pciids.h" |
32 | 32 | ||
33 | static int postinit( struct drm_device *dev, unsigned long flags ) | 33 | static int postinit(struct drm_device *dev, unsigned long flags) |
34 | { | 34 | { |
35 | DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n", | 35 | DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n", |
36 | DRIVER_NAME, | 36 | DRIVER_NAME, |
37 | DRIVER_MAJOR, | 37 | DRIVER_MAJOR, |
38 | DRIVER_MINOR, | 38 | DRIVER_MINOR, |
39 | DRIVER_PATCHLEVEL, | 39 | DRIVER_PATCHLEVEL, |
40 | DRIVER_DATE, | 40 | DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev) |
41 | dev->primary.minor, | 41 | ); |
42 | pci_pretty_name(dev->pdev) | ||
43 | ); | ||
44 | return 0; | 42 | return 0; |
45 | } | 43 | } |
46 | 44 | ||
47 | static int version( drm_version_t *version ) | 45 | static int version(drm_version_t * version) |
48 | { | 46 | { |
49 | int len; | 47 | int len; |
50 | 48 | ||
51 | version->version_major = DRIVER_MAJOR; | 49 | version->version_major = DRIVER_MAJOR; |
52 | version->version_minor = DRIVER_MINOR; | 50 | version->version_minor = DRIVER_MINOR; |
53 | version->version_patchlevel = DRIVER_PATCHLEVEL; | 51 | version->version_patchlevel = DRIVER_PATCHLEVEL; |
54 | DRM_COPY( version->name, DRIVER_NAME ); | 52 | DRM_COPY(version->name, DRIVER_NAME); |
55 | DRM_COPY( version->date, DRIVER_DATE ); | 53 | DRM_COPY(version->date, DRIVER_DATE); |
56 | DRM_COPY( version->desc, DRIVER_DESC ); | 54 | DRM_COPY(version->desc, DRIVER_DESC); |
57 | return 0; | 55 | return 0; |
58 | } | 56 | } |
59 | 57 | ||
@@ -61,13 +59,9 @@ static struct pci_device_id pciidlist[] = { | |||
61 | savage_PCI_IDS | 59 | savage_PCI_IDS |
62 | }; | 60 | }; |
63 | 61 | ||
64 | extern drm_ioctl_desc_t savage_ioctls[]; | ||
65 | extern int savage_max_ioctl; | ||
66 | |||
67 | static struct drm_driver driver = { | 62 | static struct drm_driver driver = { |
68 | .driver_features = | 63 | .driver_features = |
69 | DRIVER_USE_AGP | DRIVER_USE_MTRR | | 64 | DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_PCI_DMA, |
70 | DRIVER_HAVE_DMA | DRIVER_PCI_DMA, | ||
71 | .dev_priv_size = sizeof(drm_savage_buf_priv_t), | 65 | .dev_priv_size = sizeof(drm_savage_buf_priv_t), |
72 | .preinit = savage_preinit, | 66 | .preinit = savage_preinit, |
73 | .postinit = postinit, | 67 | .postinit = postinit, |
@@ -79,18 +73,19 @@ static struct drm_driver driver = { | |||
79 | .ioctls = savage_ioctls, | 73 | .ioctls = savage_ioctls, |
80 | .dma_ioctl = savage_bci_buffers, | 74 | .dma_ioctl = savage_bci_buffers, |
81 | .fops = { | 75 | .fops = { |
82 | .owner = THIS_MODULE, | 76 | .owner = THIS_MODULE, |
83 | .open = drm_open, | 77 | .open = drm_open, |
84 | .release = drm_release, | 78 | .release = drm_release, |
85 | .ioctl = drm_ioctl, | 79 | .ioctl = drm_ioctl, |
86 | .mmap = drm_mmap, | 80 | .mmap = drm_mmap, |
87 | .poll = drm_poll, | 81 | .poll = drm_poll, |
88 | .fasync = drm_fasync, | 82 | .fasync = drm_fasync, |
89 | }, | 83 | } |
84 | , | ||
90 | .pci_driver = { | 85 | .pci_driver = { |
91 | .name = DRIVER_NAME, | 86 | .name = DRIVER_NAME, |
92 | .id_table = pciidlist, | 87 | .id_table = pciidlist, |
93 | } | 88 | } |
94 | }; | 89 | }; |
95 | 90 | ||
96 | static int __init savage_init(void) | 91 | static int __init savage_init(void) |
@@ -107,6 +102,6 @@ static void __exit savage_exit(void) | |||
107 | module_init(savage_init); | 102 | module_init(savage_init); |
108 | module_exit(savage_exit); | 103 | module_exit(savage_exit); |
109 | 104 | ||
110 | MODULE_AUTHOR( DRIVER_AUTHOR ); | 105 | MODULE_AUTHOR(DRIVER_AUTHOR); |
111 | MODULE_DESCRIPTION( DRIVER_DESC ); | 106 | MODULE_DESCRIPTION(DRIVER_DESC); |
112 | MODULE_LICENSE("GPL and additional rights"); | 107 | MODULE_LICENSE("GPL and additional rights"); |