diff options
Diffstat (limited to 'drivers/char/drm/tdfx_drv.c')
-rw-r--r-- | drivers/char/drm/tdfx_drv.c | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/drivers/char/drm/tdfx_drv.c b/drivers/char/drm/tdfx_drv.c index 0e7943e6efea..c275cbb6e9ce 100644 --- a/drivers/char/drm/tdfx_drv.c +++ b/drivers/char/drm/tdfx_drv.c | |||
@@ -36,30 +36,28 @@ | |||
36 | 36 | ||
37 | #include "drm_pciids.h" | 37 | #include "drm_pciids.h" |
38 | 38 | ||
39 | static int postinit( struct drm_device *dev, unsigned long flags ) | 39 | static int postinit(struct drm_device *dev, unsigned long flags) |
40 | { | 40 | { |
41 | DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n", | 41 | DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n", |
42 | DRIVER_NAME, | 42 | DRIVER_NAME, |
43 | DRIVER_MAJOR, | 43 | DRIVER_MAJOR, |
44 | DRIVER_MINOR, | 44 | DRIVER_MINOR, |
45 | DRIVER_PATCHLEVEL, | 45 | DRIVER_PATCHLEVEL, |
46 | DRIVER_DATE, | 46 | DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev) |
47 | dev->primary.minor, | 47 | ); |
48 | pci_pretty_name(dev->pdev) | ||
49 | ); | ||
50 | return 0; | 48 | return 0; |
51 | } | 49 | } |
52 | 50 | ||
53 | static int version( drm_version_t *version ) | 51 | static int version(drm_version_t * version) |
54 | { | 52 | { |
55 | int len; | 53 | int len; |
56 | 54 | ||
57 | version->version_major = DRIVER_MAJOR; | 55 | version->version_major = DRIVER_MAJOR; |
58 | version->version_minor = DRIVER_MINOR; | 56 | version->version_minor = DRIVER_MINOR; |
59 | version->version_patchlevel = DRIVER_PATCHLEVEL; | 57 | version->version_patchlevel = DRIVER_PATCHLEVEL; |
60 | DRM_COPY( version->name, DRIVER_NAME ); | 58 | DRM_COPY(version->name, DRIVER_NAME); |
61 | DRM_COPY( version->date, DRIVER_DATE ); | 59 | DRM_COPY(version->date, DRIVER_DATE); |
62 | DRM_COPY( version->desc, DRIVER_DESC ); | 60 | DRM_COPY(version->desc, DRIVER_DESC); |
63 | return 0; | 61 | return 0; |
64 | } | 62 | } |
65 | 63 | ||
@@ -75,18 +73,18 @@ static struct drm_driver driver = { | |||
75 | .postinit = postinit, | 73 | .postinit = postinit, |
76 | .version = version, | 74 | .version = version, |
77 | .fops = { | 75 | .fops = { |
78 | .owner = THIS_MODULE, | 76 | .owner = THIS_MODULE, |
79 | .open = drm_open, | 77 | .open = drm_open, |
80 | .release = drm_release, | 78 | .release = drm_release, |
81 | .ioctl = drm_ioctl, | 79 | .ioctl = drm_ioctl, |
82 | .mmap = drm_mmap, | 80 | .mmap = drm_mmap, |
83 | .poll = drm_poll, | 81 | .poll = drm_poll, |
84 | .fasync = drm_fasync, | 82 | .fasync = drm_fasync, |
85 | }, | 83 | }, |
86 | .pci_driver = { | 84 | .pci_driver = { |
87 | .name = DRIVER_NAME, | 85 | .name = DRIVER_NAME, |
88 | .id_table = pciidlist, | 86 | .id_table = pciidlist, |
89 | } | 87 | } |
90 | }; | 88 | }; |
91 | 89 | ||
92 | static int __init tdfx_init(void) | 90 | static int __init tdfx_init(void) |
@@ -102,6 +100,6 @@ static void __exit tdfx_exit(void) | |||
102 | module_init(tdfx_init); | 100 | module_init(tdfx_init); |
103 | module_exit(tdfx_exit); | 101 | module_exit(tdfx_exit); |
104 | 102 | ||
105 | MODULE_AUTHOR( DRIVER_AUTHOR ); | 103 | MODULE_AUTHOR(DRIVER_AUTHOR); |
106 | MODULE_DESCRIPTION( DRIVER_DESC ); | 104 | MODULE_DESCRIPTION(DRIVER_DESC); |
107 | MODULE_LICENSE("GPL and additional rights"); | 105 | MODULE_LICENSE("GPL and additional rights"); |