diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-25 00:28:13 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 00:28:13 -0400 |
commit | b5e89ed53ed8d24f83ba1941c07382af00ed238e (patch) | |
tree | 747bae7a565f88a2e1d5974776eeb054a932c505 /drivers/char/drm/i810_drv.c | |
parent | 99a2657a29e2d623c3568cd86b27cac13fb63140 (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/i810_drv.c')
-rw-r--r-- | drivers/char/drm/i810_drv.c | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c index 00609329d578..327e2f1cc997 100644 --- a/drivers/char/drm/i810_drv.c +++ b/drivers/char/drm/i810_drv.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | #include "drm_pciids.h" | 39 | #include "drm_pciids.h" |
40 | 40 | ||
41 | static int postinit( struct drm_device *dev, unsigned long flags ) | 41 | static int postinit(struct drm_device *dev, unsigned long flags) |
42 | { | 42 | { |
43 | /* i810 has 4 more counters */ | 43 | /* i810 has 4 more counters */ |
44 | dev->counters += 4; | 44 | dev->counters += 4; |
@@ -46,29 +46,27 @@ static int postinit( struct drm_device *dev, unsigned long flags ) | |||
46 | dev->types[7] = _DRM_STAT_PRIMARY; | 46 | dev->types[7] = _DRM_STAT_PRIMARY; |
47 | dev->types[8] = _DRM_STAT_SECONDARY; | 47 | dev->types[8] = _DRM_STAT_SECONDARY; |
48 | dev->types[9] = _DRM_STAT_DMA; | 48 | dev->types[9] = _DRM_STAT_DMA; |
49 | 49 | ||
50 | DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n", | 50 | DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n", |
51 | DRIVER_NAME, | 51 | DRIVER_NAME, |
52 | DRIVER_MAJOR, | 52 | DRIVER_MAJOR, |
53 | DRIVER_MINOR, | 53 | DRIVER_MINOR, |
54 | DRIVER_PATCHLEVEL, | 54 | DRIVER_PATCHLEVEL, |
55 | DRIVER_DATE, | 55 | DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev) |
56 | dev->primary.minor, | 56 | ); |
57 | pci_pretty_name(dev->pdev) | ||
58 | ); | ||
59 | return 0; | 57 | return 0; |
60 | } | 58 | } |
61 | 59 | ||
62 | static int version( drm_version_t *version ) | 60 | static int version(drm_version_t * version) |
63 | { | 61 | { |
64 | int len; | 62 | int len; |
65 | 63 | ||
66 | version->version_major = DRIVER_MAJOR; | 64 | version->version_major = DRIVER_MAJOR; |
67 | version->version_minor = DRIVER_MINOR; | 65 | version->version_minor = DRIVER_MINOR; |
68 | version->version_patchlevel = DRIVER_PATCHLEVEL; | 66 | version->version_patchlevel = DRIVER_PATCHLEVEL; |
69 | DRM_COPY( version->name, DRIVER_NAME ); | 67 | DRM_COPY(version->name, DRIVER_NAME); |
70 | DRM_COPY( version->date, DRIVER_DATE ); | 68 | DRM_COPY(version->date, DRIVER_DATE); |
71 | DRM_COPY( version->desc, DRIVER_DESC ); | 69 | DRM_COPY(version->desc, DRIVER_DESC); |
72 | return 0; | 70 | return 0; |
73 | } | 71 | } |
74 | 72 | ||
@@ -80,7 +78,9 @@ extern drm_ioctl_desc_t i810_ioctls[]; | |||
80 | extern int i810_max_ioctl; | 78 | extern int i810_max_ioctl; |
81 | 79 | ||
82 | static struct drm_driver driver = { | 80 | static struct drm_driver driver = { |
83 | .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_DMA_QUEUE, | 81 | .driver_features = |
82 | DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | | ||
83 | DRIVER_HAVE_DMA | DRIVER_DMA_QUEUE, | ||
84 | .dev_priv_size = sizeof(drm_i810_buf_priv_t), | 84 | .dev_priv_size = sizeof(drm_i810_buf_priv_t), |
85 | .pretakedown = i810_driver_pretakedown, | 85 | .pretakedown = i810_driver_pretakedown, |
86 | .prerelease = i810_driver_prerelease, | 86 | .prerelease = i810_driver_prerelease, |
@@ -94,18 +94,20 @@ static struct drm_driver driver = { | |||
94 | .version = version, | 94 | .version = version, |
95 | .ioctls = i810_ioctls, | 95 | .ioctls = i810_ioctls, |
96 | .fops = { | 96 | .fops = { |
97 | .owner = THIS_MODULE, | 97 | .owner = THIS_MODULE, |
98 | .open = drm_open, | 98 | .open = drm_open, |
99 | .release = drm_release, | 99 | .release = drm_release, |
100 | .ioctl = drm_ioctl, | 100 | .ioctl = drm_ioctl, |
101 | .mmap = drm_mmap, | 101 | .mmap = drm_mmap, |
102 | .poll = drm_poll, | 102 | .poll = drm_poll, |
103 | .fasync = drm_fasync, | 103 | .fasync = drm_fasync, |
104 | }, | 104 | } |
105 | , | ||
105 | .pci_driver = { | 106 | .pci_driver = { |
106 | .name = DRIVER_NAME, | 107 | .name = DRIVER_NAME, |
107 | .id_table = pciidlist, | 108 | .id_table = pciidlist, |
108 | }, | 109 | } |
110 | , | ||
109 | }; | 111 | }; |
110 | 112 | ||
111 | static int __init i810_init(void) | 113 | static int __init i810_init(void) |
@@ -122,6 +124,6 @@ static void __exit i810_exit(void) | |||
122 | module_init(i810_init); | 124 | module_init(i810_init); |
123 | module_exit(i810_exit); | 125 | module_exit(i810_exit); |
124 | 126 | ||
125 | MODULE_AUTHOR( DRIVER_AUTHOR ); | 127 | MODULE_AUTHOR(DRIVER_AUTHOR); |
126 | MODULE_DESCRIPTION( DRIVER_DESC ); | 128 | MODULE_DESCRIPTION(DRIVER_DESC); |
127 | MODULE_LICENSE("GPL and additional rights"); | 129 | MODULE_LICENSE("GPL and additional rights"); |