aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/savage_drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/savage_drv.c')
-rw-r--r--drivers/char/drm/savage_drv.c56
1 files changed, 27 insertions, 29 deletions
diff --git a/drivers/char/drm/savage_drv.c b/drivers/char/drm/savage_drv.c
index ac8d270427ca..0906f9a5d8f9 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
33static int postinit( struct drm_device *dev, unsigned long flags ) 33static 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
47static int version( drm_version_t *version ) 45static 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
@@ -66,8 +64,7 @@ extern int savage_max_ioctl;
66 64
67static struct drm_driver driver = { 65static struct drm_driver driver = {
68 .driver_features = 66 .driver_features =
69 DRIVER_USE_AGP | DRIVER_USE_MTRR | 67 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), 68 .dev_priv_size = sizeof(drm_savage_buf_priv_t),
72 .preinit = savage_preinit, 69 .preinit = savage_preinit,
73 .postinit = postinit, 70 .postinit = postinit,
@@ -79,18 +76,19 @@ static struct drm_driver driver = {
79 .ioctls = savage_ioctls, 76 .ioctls = savage_ioctls,
80 .dma_ioctl = savage_bci_buffers, 77 .dma_ioctl = savage_bci_buffers,
81 .fops = { 78 .fops = {
82 .owner = THIS_MODULE, 79 .owner = THIS_MODULE,
83 .open = drm_open, 80 .open = drm_open,
84 .release = drm_release, 81 .release = drm_release,
85 .ioctl = drm_ioctl, 82 .ioctl = drm_ioctl,
86 .mmap = drm_mmap, 83 .mmap = drm_mmap,
87 .poll = drm_poll, 84 .poll = drm_poll,
88 .fasync = drm_fasync, 85 .fasync = drm_fasync,
89 }, 86 }
87 ,
90 .pci_driver = { 88 .pci_driver = {
91 .name = DRIVER_NAME, 89 .name = DRIVER_NAME,
92 .id_table = pciidlist, 90 .id_table = pciidlist,
93 } 91 }
94}; 92};
95 93
96static int __init savage_init(void) 94static int __init savage_init(void)
@@ -107,6 +105,6 @@ static void __exit savage_exit(void)
107module_init(savage_init); 105module_init(savage_init);
108module_exit(savage_exit); 106module_exit(savage_exit);
109 107
110MODULE_AUTHOR( DRIVER_AUTHOR ); 108MODULE_AUTHOR(DRIVER_AUTHOR);
111MODULE_DESCRIPTION( DRIVER_DESC ); 109MODULE_DESCRIPTION(DRIVER_DESC);
112MODULE_LICENSE("GPL and additional rights"); 110MODULE_LICENSE("GPL and additional rights");