diff options
Diffstat (limited to 'drivers/char/drm/sis_drv.c')
-rw-r--r-- | drivers/char/drm/sis_drv.c | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/drivers/char/drm/sis_drv.c b/drivers/char/drm/sis_drv.c index f441714faae3..6d0cb2226005 100644 --- a/drivers/char/drm/sis_drv.c +++ b/drivers/char/drm/sis_drv.c | |||
@@ -10,11 +10,11 @@ | |||
10 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | 10 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
11 | * and/or sell copies of the Software, and to permit persons to whom the | 11 | * and/or sell copies of the Software, and to permit persons to whom the |
12 | * Software is furnished to do so, subject to the following conditions: | 12 | * Software is furnished to do so, subject to the following conditions: |
13 | * | 13 | * |
14 | * The above copyright notice and this permission notice (including the next | 14 | * The above copyright notice and this permission notice (including the next |
15 | * paragraph) shall be included in all copies or substantial portions of the | 15 | * paragraph) shall be included in all copies or substantial portions of the |
16 | * Software. | 16 | * Software. |
17 | * | 17 | * |
18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
20 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | 20 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
@@ -31,31 +31,29 @@ | |||
31 | #include "sis_drv.h" | 31 | #include "sis_drv.h" |
32 | 32 | ||
33 | #include "drm_pciids.h" | 33 | #include "drm_pciids.h" |
34 | 34 | ||
35 | static int postinit( struct drm_device *dev, unsigned long flags ) | 35 | static int postinit(struct drm_device *dev, unsigned long flags) |
36 | { | 36 | { |
37 | DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n", | 37 | DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n", |
38 | DRIVER_NAME, | 38 | DRIVER_NAME, |
39 | DRIVER_MAJOR, | 39 | DRIVER_MAJOR, |
40 | DRIVER_MINOR, | 40 | DRIVER_MINOR, |
41 | DRIVER_PATCHLEVEL, | 41 | DRIVER_PATCHLEVEL, |
42 | DRIVER_DATE, | 42 | DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev) |
43 | dev->primary.minor, | 43 | ); |
44 | pci_pretty_name(dev->pdev) | ||
45 | ); | ||
46 | return 0; | 44 | return 0; |
47 | } | 45 | } |
48 | 46 | ||
49 | static int version( drm_version_t *version ) | 47 | static int version(drm_version_t * version) |
50 | { | 48 | { |
51 | int len; | 49 | int len; |
52 | 50 | ||
53 | version->version_major = DRIVER_MAJOR; | 51 | version->version_major = DRIVER_MAJOR; |
54 | version->version_minor = DRIVER_MINOR; | 52 | version->version_minor = DRIVER_MINOR; |
55 | version->version_patchlevel = DRIVER_PATCHLEVEL; | 53 | version->version_patchlevel = DRIVER_PATCHLEVEL; |
56 | DRM_COPY( version->name, DRIVER_NAME ); | 54 | DRM_COPY(version->name, DRIVER_NAME); |
57 | DRM_COPY( version->date, DRIVER_DATE ); | 55 | DRM_COPY(version->date, DRIVER_DATE); |
58 | DRM_COPY( version->desc, DRIVER_DESC ); | 56 | DRM_COPY(version->desc, DRIVER_DESC); |
59 | return 0; | 57 | return 0; |
60 | } | 58 | } |
61 | 59 | ||
@@ -77,18 +75,18 @@ static struct drm_driver driver = { | |||
77 | .version = version, | 75 | .version = version, |
78 | .ioctls = sis_ioctls, | 76 | .ioctls = sis_ioctls, |
79 | .fops = { | 77 | .fops = { |
80 | .owner = THIS_MODULE, | 78 | .owner = THIS_MODULE, |
81 | .open = drm_open, | 79 | .open = drm_open, |
82 | .release = drm_release, | 80 | .release = drm_release, |
83 | .ioctl = drm_ioctl, | 81 | .ioctl = drm_ioctl, |
84 | .mmap = drm_mmap, | 82 | .mmap = drm_mmap, |
85 | .poll = drm_poll, | 83 | .poll = drm_poll, |
86 | .fasync = drm_fasync, | 84 | .fasync = drm_fasync, |
87 | }, | 85 | }, |
88 | .pci_driver = { | 86 | .pci_driver = { |
89 | .name = DRIVER_NAME, | 87 | .name = DRIVER_NAME, |
90 | .id_table = pciidlist, | 88 | .id_table = pciidlist, |
91 | } | 89 | } |
92 | }; | 90 | }; |
93 | 91 | ||
94 | static int __init sis_init(void) | 92 | static int __init sis_init(void) |
@@ -105,6 +103,6 @@ static void __exit sis_exit(void) | |||
105 | module_init(sis_init); | 103 | module_init(sis_init); |
106 | module_exit(sis_exit); | 104 | module_exit(sis_exit); |
107 | 105 | ||
108 | MODULE_AUTHOR( DRIVER_AUTHOR ); | 106 | MODULE_AUTHOR(DRIVER_AUTHOR); |
109 | MODULE_DESCRIPTION( DRIVER_DESC ); | 107 | MODULE_DESCRIPTION(DRIVER_DESC); |
110 | MODULE_LICENSE("GPL and additional rights"); | 108 | MODULE_LICENSE("GPL and additional rights"); |