aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/r128_drv.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-09-25 00:28:13 -0400
committerDave Airlie <airlied@linux.ie>2005-09-25 00:28:13 -0400
commitb5e89ed53ed8d24f83ba1941c07382af00ed238e (patch)
tree747bae7a565f88a2e1d5974776eeb054a932c505 /drivers/char/drm/r128_drv.c
parent99a2657a29e2d623c3568cd86b27cac13fb63140 (diff)
drm: lindent the drm directory.
I've been threatening this for a while, so no point hanging around. This lindents the DRM code which was always really bad in tabbing department. I've also fixed some misnamed files in comments and removed some trailing whitespace. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/r128_drv.c')
-rw-r--r--drivers/char/drm/r128_drv.c60
1 files changed, 31 insertions, 29 deletions
diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c
index bc446da1b210..4d9224645f04 100644
--- a/drivers/char/drm/r128_drv.c
+++ b/drivers/char/drm/r128_drv.c
@@ -37,30 +37,28 @@
37 37
38#include "drm_pciids.h" 38#include "drm_pciids.h"
39 39
40static int postinit( struct drm_device *dev, unsigned long flags ) 40static int postinit(struct drm_device *dev, unsigned long flags)
41{ 41{
42 DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n", 42 DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
43 DRIVER_NAME, 43 DRIVER_NAME,
44 DRIVER_MAJOR, 44 DRIVER_MAJOR,
45 DRIVER_MINOR, 45 DRIVER_MINOR,
46 DRIVER_PATCHLEVEL, 46 DRIVER_PATCHLEVEL,
47 DRIVER_DATE, 47 DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
48 dev->primary.minor, 48 );
49 pci_pretty_name(dev->pdev)
50 );
51 return 0; 49 return 0;
52} 50}
53 51
54static int version( drm_version_t *version ) 52static int version(drm_version_t * version)
55{ 53{
56 int len; 54 int len;
57 55
58 version->version_major = DRIVER_MAJOR; 56 version->version_major = DRIVER_MAJOR;
59 version->version_minor = DRIVER_MINOR; 57 version->version_minor = DRIVER_MINOR;
60 version->version_patchlevel = DRIVER_PATCHLEVEL; 58 version->version_patchlevel = DRIVER_PATCHLEVEL;
61 DRM_COPY( version->name, DRIVER_NAME ); 59 DRM_COPY(version->name, DRIVER_NAME);
62 DRM_COPY( version->date, DRIVER_DATE ); 60 DRM_COPY(version->date, DRIVER_DATE);
63 DRM_COPY( version->desc, DRIVER_DESC ); 61 DRM_COPY(version->desc, DRIVER_DESC);
64 return 0; 62 return 0;
65} 63}
66 64
@@ -72,7 +70,10 @@ extern drm_ioctl_desc_t r128_ioctls[];
72extern int r128_max_ioctl; 70extern int r128_max_ioctl;
73 71
74static struct drm_driver driver = { 72static struct drm_driver driver = {
75 .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL, 73 .driver_features =
74 DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
75 DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
76 DRIVER_IRQ_VBL,
76 .dev_priv_size = sizeof(drm_r128_buf_priv_t), 77 .dev_priv_size = sizeof(drm_r128_buf_priv_t),
77 .prerelease = r128_driver_prerelease, 78 .prerelease = r128_driver_prerelease,
78 .pretakedown = r128_driver_pretakedown, 79 .pretakedown = r128_driver_pretakedown,
@@ -89,21 +90,22 @@ static struct drm_driver driver = {
89 .ioctls = r128_ioctls, 90 .ioctls = r128_ioctls,
90 .dma_ioctl = r128_cce_buffers, 91 .dma_ioctl = r128_cce_buffers,
91 .fops = { 92 .fops = {
92 .owner = THIS_MODULE, 93 .owner = THIS_MODULE,
93 .open = drm_open, 94 .open = drm_open,
94 .release = drm_release, 95 .release = drm_release,
95 .ioctl = drm_ioctl, 96 .ioctl = drm_ioctl,
96 .mmap = drm_mmap, 97 .mmap = drm_mmap,
97 .poll = drm_poll, 98 .poll = drm_poll,
98 .fasync = drm_fasync, 99 .fasync = drm_fasync,
99#ifdef CONFIG_COMPAT 100#ifdef CONFIG_COMPAT
100 .compat_ioctl = r128_compat_ioctl, 101 .compat_ioctl = r128_compat_ioctl,
101#endif 102#endif
102 }, 103 }
104 ,
103 .pci_driver = { 105 .pci_driver = {
104 .name = DRIVER_NAME, 106 .name = DRIVER_NAME,
105 .id_table = pciidlist, 107 .id_table = pciidlist,
106 } 108 }
107}; 109};
108 110
109static int __init r128_init(void) 111static int __init r128_init(void)
@@ -120,6 +122,6 @@ static void __exit r128_exit(void)
120module_init(r128_init); 122module_init(r128_init);
121module_exit(r128_exit); 123module_exit(r128_exit);
122 124
123MODULE_AUTHOR( DRIVER_AUTHOR ); 125MODULE_AUTHOR(DRIVER_AUTHOR);
124MODULE_DESCRIPTION( DRIVER_DESC ); 126MODULE_DESCRIPTION(DRIVER_DESC);
125MODULE_LICENSE("GPL and additional rights"); 127MODULE_LICENSE("GPL and additional rights");