aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2008-01-24 00:58:57 -0500
committerDave Airlie <airlied@redhat.com>2008-02-07 00:09:39 -0500
commit3e684eae586a9b210a4517da5637a255b1ff5a92 (patch)
treed8703d708e8fd37f0f1a74d9328e2da3faa555fc /drivers/char
parent4d1f78880e9631fb08052dcc8e3341eecea537e0 (diff)
drm: cleanup DRM_DEBUG() parameters
As DRM_DEBUG macro already prints out the __FUNCTION__ string (see drivers/char/drm/drmP.h), it is not worth doing this again. At some other places the ending "\n" was added. airlied:- I cleaned up a few that this patch missed also Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/drm/ati_pcigart.c6
-rw-r--r--drivers/char/drm/drm_irq.c4
-rw-r--r--drivers/char/drm/drm_scatter.c10
-rw-r--r--drivers/char/drm/drm_vm.c4
-rw-r--r--drivers/char/drm/i810_dma.c22
-rw-r--r--drivers/char/drm/i810_drv.h2
-rw-r--r--drivers/char/drm/i830_drv.h3
-rw-r--r--drivers/char/drm/i915_dma.c6
-rw-r--r--drivers/char/drm/i915_drv.h5
-rw-r--r--drivers/char/drm/i915_irq.c20
-rw-r--r--drivers/char/drm/i915_mem.c8
-rw-r--r--drivers/char/drm/mga_dma.c2
-rw-r--r--drivers/char/drm/mga_drv.h11
-rw-r--r--drivers/char/drm/mga_state.c14
-rw-r--r--drivers/char/drm/r128_cce.c4
-rw-r--r--drivers/char/drm/r128_drv.h3
-rw-r--r--drivers/char/drm/r128_state.c43
-rw-r--r--drivers/char/drm/radeon_cp.c8
-rw-r--r--drivers/char/drm/radeon_drv.h3
-rw-r--r--drivers/char/drm/radeon_irq.c6
-rw-r--r--drivers/char/drm/radeon_mem.c6
-rw-r--r--drivers/char/drm/radeon_state.c15
-rw-r--r--drivers/char/drm/sis_mm.c4
-rw-r--r--drivers/char/drm/via_dma.c20
-rw-r--r--drivers/char/drm/via_irq.c26
-rw-r--r--drivers/char/drm/via_map.c4
-rw-r--r--drivers/char/drm/via_mm.c4
-rw-r--r--drivers/char/drm/via_video.c4
28 files changed, 122 insertions, 145 deletions
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index 3345641ff904..d352dbb4ccf7 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -41,7 +41,7 @@ static void *drm_ati_alloc_pcigart_table(int order)
41 struct page *page; 41 struct page *page;
42 int i; 42 int i;
43 43
44 DRM_DEBUG("%s: alloc %d order\n", __FUNCTION__, order); 44 DRM_DEBUG("%d order\n", order);
45 45
46 address = __get_free_pages(GFP_KERNEL | __GFP_COMP, 46 address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
47 order); 47 order);
@@ -54,7 +54,7 @@ static void *drm_ati_alloc_pcigart_table(int order)
54 for (i = 0; i < order; i++, page++) 54 for (i = 0; i < order; i++, page++)
55 SetPageReserved(page); 55 SetPageReserved(page);
56 56
57 DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address); 57 DRM_DEBUG("returning 0x%08lx\n", address);
58 return (void *)address; 58 return (void *)address;
59} 59}
60 60
@@ -63,7 +63,7 @@ static void drm_ati_free_pcigart_table(void *address, int order)
63 struct page *page; 63 struct page *page;
64 int i; 64 int i;
65 int num_pages = 1 << order; 65 int num_pages = 1 << order;
66 DRM_DEBUG("%s\n", __FUNCTION__); 66 DRM_DEBUG("\n");
67 67
68 page = virt_to_page((unsigned long)address); 68 page = virt_to_page((unsigned long)address);
69 69
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index 05eae63f85ba..089c015c01d1 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -107,7 +107,7 @@ static int drm_irq_install(struct drm_device * dev)
107 dev->irq_enabled = 1; 107 dev->irq_enabled = 1;
108 mutex_unlock(&dev->struct_mutex); 108 mutex_unlock(&dev->struct_mutex);
109 109
110 DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq); 110 DRM_DEBUG("irq=%d\n", dev->irq);
111 111
112 if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) { 112 if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) {
113 init_waitqueue_head(&dev->vbl_queue); 113 init_waitqueue_head(&dev->vbl_queue);
@@ -164,7 +164,7 @@ int drm_irq_uninstall(struct drm_device * dev)
164 if (!irq_enabled) 164 if (!irq_enabled)
165 return -EINVAL; 165 return -EINVAL;
166 166
167 DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq); 167 DRM_DEBUG("irq=%d\n", dev->irq);
168 168
169 dev->driver->irq_uninstall(dev); 169 dev->driver->irq_uninstall(dev);
170 170
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index eb7fa437355e..26d8f675ed5d 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -67,7 +67,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
67 struct drm_sg_mem *entry; 67 struct drm_sg_mem *entry;
68 unsigned long pages, i, j; 68 unsigned long pages, i, j;
69 69
70 DRM_DEBUG("%s\n", __FUNCTION__); 70 DRM_DEBUG("\n");
71 71
72 if (!drm_core_check_feature(dev, DRIVER_SG)) 72 if (!drm_core_check_feature(dev, DRIVER_SG))
73 return -EINVAL; 73 return -EINVAL;
@@ -81,7 +81,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
81 81
82 memset(entry, 0, sizeof(*entry)); 82 memset(entry, 0, sizeof(*entry));
83 pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE; 83 pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;
84 DRM_DEBUG("sg size=%ld pages=%ld\n", request->size, pages); 84 DRM_DEBUG("size=%ld pages=%ld\n", request->size, pages);
85 85
86 entry->pages = pages; 86 entry->pages = pages;
87 entry->pagelist = drm_alloc(pages * sizeof(*entry->pagelist), 87 entry->pagelist = drm_alloc(pages * sizeof(*entry->pagelist),
@@ -122,8 +122,8 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
122 122
123 entry->handle = ScatterHandle((unsigned long)entry->virtual); 123 entry->handle = ScatterHandle((unsigned long)entry->virtual);
124 124
125 DRM_DEBUG("sg alloc handle = %08lx\n", entry->handle); 125 DRM_DEBUG("handle = %08lx\n", entry->handle);
126 DRM_DEBUG("sg alloc virtual = %p\n", entry->virtual); 126 DRM_DEBUG("virtual = %p\n", entry->virtual);
127 127
128 for (i = (unsigned long)entry->virtual, j = 0; j < pages; 128 for (i = (unsigned long)entry->virtual, j = 0; j < pages;
129 i += PAGE_SIZE, j++) { 129 i += PAGE_SIZE, j++) {
@@ -210,7 +210,7 @@ int drm_sg_free(struct drm_device *dev, void *data,
210 if (!entry || entry->handle != request->handle) 210 if (!entry || entry->handle != request->handle)
211 return -EINVAL; 211 return -EINVAL;
212 212
213 DRM_DEBUG("sg free virtual = %p\n", entry->virtual); 213 DRM_DEBUG("virtual = %p\n", entry->virtual);
214 214
215 drm_sg_cleanup(entry); 215 drm_sg_cleanup(entry);
216 216
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index ef5e6b130c48..cea4105374b2 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -180,7 +180,7 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
180 return NOPAGE_SIGBUS; 180 return NOPAGE_SIGBUS;
181 get_page(page); 181 get_page(page);
182 182
183 DRM_DEBUG("shm_nopage 0x%lx\n", address); 183 DRM_DEBUG("0x%lx\n", address);
184 return page; 184 return page;
185} 185}
186 186
@@ -294,7 +294,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
294 294
295 get_page(page); 295 get_page(page);
296 296
297 DRM_DEBUG("dma_nopage 0x%lx (page %lu)\n", address, page_nr); 297 DRM_DEBUG("0x%lx (page %lu)\n", address, page_nr);
298 return page; 298 return page;
299} 299}
300 300
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index aa2fa9b184ac..8d7ea81c4b66 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -570,7 +570,7 @@ static void i810EmitState(struct drm_device * dev)
570 drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv; 570 drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
571 unsigned int dirty = sarea_priv->dirty; 571 unsigned int dirty = sarea_priv->dirty;
572 572
573 DRM_DEBUG("%s %x\n", __FUNCTION__, dirty); 573 DRM_DEBUG("%x\n", dirty);
574 574
575 if (dirty & I810_UPLOAD_BUFFERS) { 575 if (dirty & I810_UPLOAD_BUFFERS) {
576 i810EmitDestVerified(dev, sarea_priv->BufferState); 576 i810EmitDestVerified(dev, sarea_priv->BufferState);
@@ -802,8 +802,7 @@ static void i810_dma_dispatch_flip(struct drm_device * dev)
802 int pitch = dev_priv->pitch; 802 int pitch = dev_priv->pitch;
803 RING_LOCALS; 803 RING_LOCALS;
804 804
805 DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n", 805 DRM_DEBUG("page=%d pfCurrentPage=%d\n",
806 __FUNCTION__,
807 dev_priv->current_page, 806 dev_priv->current_page,
808 dev_priv->sarea_priv->pf_current_page); 807 dev_priv->sarea_priv->pf_current_page);
809 808
@@ -848,8 +847,6 @@ static void i810_dma_quiescent(struct drm_device * dev)
848 drm_i810_private_t *dev_priv = dev->dev_private; 847 drm_i810_private_t *dev_priv = dev->dev_private;
849 RING_LOCALS; 848 RING_LOCALS;
850 849
851/* printk("%s\n", __FUNCTION__); */
852
853 i810_kernel_lost_context(dev); 850 i810_kernel_lost_context(dev);
854 851
855 BEGIN_LP_RING(4); 852 BEGIN_LP_RING(4);
@@ -869,8 +866,6 @@ static int i810_flush_queue(struct drm_device * dev)
869 int i, ret = 0; 866 int i, ret = 0;
870 RING_LOCALS; 867 RING_LOCALS;
871 868
872/* printk("%s\n", __FUNCTION__); */
873
874 i810_kernel_lost_context(dev); 869 i810_kernel_lost_context(dev);
875 870
876 BEGIN_LP_RING(2); 871 BEGIN_LP_RING(2);
@@ -949,7 +944,7 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
949 944
950 LOCK_TEST_WITH_RETURN(dev, file_priv); 945 LOCK_TEST_WITH_RETURN(dev, file_priv);
951 946
952 DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n", 947 DRM_DEBUG("idx %d used %d discard %d\n",
953 vertex->idx, vertex->used, vertex->discard); 948 vertex->idx, vertex->used, vertex->discard);
954 949
955 if (vertex->idx < 0 || vertex->idx > dma->buf_count) 950 if (vertex->idx < 0 || vertex->idx > dma->buf_count)
@@ -987,7 +982,7 @@ static int i810_clear_bufs(struct drm_device *dev, void *data,
987static int i810_swap_bufs(struct drm_device *dev, void *data, 982static int i810_swap_bufs(struct drm_device *dev, void *data,
988 struct drm_file *file_priv) 983 struct drm_file *file_priv)
989{ 984{
990 DRM_DEBUG("i810_swap_bufs\n"); 985 DRM_DEBUG("\n");
991 986
992 LOCK_TEST_WITH_RETURN(dev, file_priv); 987 LOCK_TEST_WITH_RETURN(dev, file_priv);
993 988
@@ -1068,11 +1063,10 @@ static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf,
1068 1063
1069 sarea_priv->dirty = 0x7f; 1064 sarea_priv->dirty = 0x7f;
1070 1065
1071 DRM_DEBUG("dispatch mc addr 0x%lx, used 0x%x\n", address, used); 1066 DRM_DEBUG("addr 0x%lx, used 0x%x\n", address, used);
1072 1067
1073 dev_priv->counter++; 1068 dev_priv->counter++;
1074 DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter); 1069 DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter);
1075 DRM_DEBUG("i810_dma_dispatch_mc\n");
1076 DRM_DEBUG("start : %lx\n", start); 1070 DRM_DEBUG("start : %lx\n", start);
1077 DRM_DEBUG("used : %d\n", used); 1071 DRM_DEBUG("used : %d\n", used);
1078 DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4); 1072 DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4);
@@ -1179,7 +1173,7 @@ static void i810_do_init_pageflip(struct drm_device * dev)
1179{ 1173{
1180 drm_i810_private_t *dev_priv = dev->dev_private; 1174 drm_i810_private_t *dev_priv = dev->dev_private;
1181 1175
1182 DRM_DEBUG("%s\n", __FUNCTION__); 1176 DRM_DEBUG("\n");
1183 dev_priv->page_flipping = 1; 1177 dev_priv->page_flipping = 1;
1184 dev_priv->current_page = 0; 1178 dev_priv->current_page = 0;
1185 dev_priv->sarea_priv->pf_current_page = dev_priv->current_page; 1179 dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
@@ -1189,7 +1183,7 @@ static int i810_do_cleanup_pageflip(struct drm_device * dev)
1189{ 1183{
1190 drm_i810_private_t *dev_priv = dev->dev_private; 1184 drm_i810_private_t *dev_priv = dev->dev_private;
1191 1185
1192 DRM_DEBUG("%s\n", __FUNCTION__); 1186 DRM_DEBUG("\n");
1193 if (dev_priv->current_page != 0) 1187 if (dev_priv->current_page != 0)
1194 i810_dma_dispatch_flip(dev); 1188 i810_dma_dispatch_flip(dev);
1195 1189
@@ -1202,7 +1196,7 @@ static int i810_flip_bufs(struct drm_device *dev, void *data,
1202{ 1196{
1203 drm_i810_private_t *dev_priv = dev->dev_private; 1197 drm_i810_private_t *dev_priv = dev->dev_private;
1204 1198
1205 DRM_DEBUG("%s\n", __FUNCTION__); 1199 DRM_DEBUG("\n");
1206 1200
1207 LOCK_TEST_WITH_RETURN(dev, file_priv); 1201 LOCK_TEST_WITH_RETURN(dev, file_priv);
1208 1202
diff --git a/drivers/char/drm/i810_drv.h b/drivers/char/drm/i810_drv.h
index 4de172b2305a..0118849a5672 100644
--- a/drivers/char/drm/i810_drv.h
+++ b/drivers/char/drm/i810_drv.h
@@ -145,7 +145,7 @@ extern int i810_max_ioctl;
145 145
146#define BEGIN_LP_RING(n) do { \ 146#define BEGIN_LP_RING(n) do { \
147 if (I810_VERBOSE) \ 147 if (I810_VERBOSE) \
148 DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", n, __FUNCTION__); \ 148 DRM_DEBUG("BEGIN_LP_RING(%d)\n", n); \
149 if (dev_priv->ring.space < n*4) \ 149 if (dev_priv->ring.space < n*4) \
150 i810_wait_ring(dev, n*4); \ 150 i810_wait_ring(dev, n*4); \
151 dev_priv->ring.space -= n*4; \ 151 dev_priv->ring.space -= n*4; \
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h
index 9843df831d7e..4caba8c54455 100644
--- a/drivers/char/drm/i830_drv.h
+++ b/drivers/char/drm/i830_drv.h
@@ -156,8 +156,7 @@ extern int i830_driver_device_is_agp(struct drm_device * dev);
156 156
157#define BEGIN_LP_RING(n) do { \ 157#define BEGIN_LP_RING(n) do { \
158 if (I830_VERBOSE) \ 158 if (I830_VERBOSE) \
159 printk("BEGIN_LP_RING(%d) in %s\n", \ 159 printk("BEGIN_LP_RING(%d)\n", (n)); \
160 n, __FUNCTION__); \
161 if (dev_priv->ring.space < n*4) \ 160 if (dev_priv->ring.space < n*4) \
162 i830_wait_ring(dev, n*4, __FUNCTION__); \ 161 i830_wait_ring(dev, n*4, __FUNCTION__); \
163 outcount = 0; \ 162 outcount = 0; \
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 24f86e07d6a4..43986d81ae34 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -657,7 +657,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
657 int value; 657 int value;
658 658
659 if (!dev_priv) { 659 if (!dev_priv) {
660 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 660 DRM_ERROR("called with no initialization\n");
661 return -EINVAL; 661 return -EINVAL;
662 } 662 }
663 663
@@ -691,7 +691,7 @@ static int i915_setparam(struct drm_device *dev, void *data,
691 drm_i915_setparam_t *param = data; 691 drm_i915_setparam_t *param = data;
692 692
693 if (!dev_priv) { 693 if (!dev_priv) {
694 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 694 DRM_ERROR("called with no initialization\n");
695 return -EINVAL; 695 return -EINVAL;
696 } 696 }
697 697
@@ -721,7 +721,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
721 drm_i915_hws_addr_t *hws = data; 721 drm_i915_hws_addr_t *hws = data;
722 722
723 if (!dev_priv) { 723 if (!dev_priv) {
724 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 724 DRM_ERROR("called with no initialization\n");
725 return -EINVAL; 725 return -EINVAL;
726 } 726 }
727 727
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 9c3f71798611..440228f71fe0 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -253,9 +253,8 @@ extern void i915_mem_release(struct drm_device * dev,
253 253
254#define BEGIN_LP_RING(n) do { \ 254#define BEGIN_LP_RING(n) do { \
255 if (I915_VERBOSE) \ 255 if (I915_VERBOSE) \
256 DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \ 256 DRM_DEBUG("BEGIN_LP_RING(%d)\n", (n)); \
257 (n), __FUNCTION__); \ 257 if (dev_priv->ring.space < (n)*4) \
258 if (dev_priv->ring.space < (n)*4) \
259 i915_wait_ring(dev, (n)*4, __FUNCTION__); \ 258 i915_wait_ring(dev, (n)*4, __FUNCTION__); \
260 outcount = 0; \ 259 outcount = 0; \
261 outring = dev_priv->ring.tail; \ 260 outring = dev_priv->ring.tail; \
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index b273fe4e1345..92653b38e64c 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -276,7 +276,7 @@ static int i915_emit_irq(struct drm_device * dev)
276 276
277 i915_kernel_lost_context(dev); 277 i915_kernel_lost_context(dev);
278 278
279 DRM_DEBUG("%s\n", __FUNCTION__); 279 DRM_DEBUG("\n");
280 280
281 dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter; 281 dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter;
282 282
@@ -300,7 +300,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
300 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; 300 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
301 int ret = 0; 301 int ret = 0;
302 302
303 DRM_DEBUG("%s irq_nr=%d breadcrumb=%d\n", __FUNCTION__, irq_nr, 303 DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
304 READ_BREADCRUMB(dev_priv)); 304 READ_BREADCRUMB(dev_priv));
305 305
306 if (READ_BREADCRUMB(dev_priv) >= irq_nr) 306 if (READ_BREADCRUMB(dev_priv) >= irq_nr)
@@ -312,8 +312,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
312 READ_BREADCRUMB(dev_priv) >= irq_nr); 312 READ_BREADCRUMB(dev_priv) >= irq_nr);
313 313
314 if (ret == -EBUSY) { 314 if (ret == -EBUSY) {
315 DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n", 315 DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
316 __FUNCTION__,
317 READ_BREADCRUMB(dev_priv), (int)dev_priv->counter); 316 READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
318 } 317 }
319 318
@@ -329,7 +328,7 @@ static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequ
329 int ret = 0; 328 int ret = 0;
330 329
331 if (!dev_priv) { 330 if (!dev_priv) {
332 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 331 DRM_ERROR("called with no initialization\n");
333 return -EINVAL; 332 return -EINVAL;
334 } 333 }
335 334
@@ -365,7 +364,7 @@ int i915_irq_emit(struct drm_device *dev, void *data,
365 LOCK_TEST_WITH_RETURN(dev, file_priv); 364 LOCK_TEST_WITH_RETURN(dev, file_priv);
366 365
367 if (!dev_priv) { 366 if (!dev_priv) {
368 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 367 DRM_ERROR("called with no initialization\n");
369 return -EINVAL; 368 return -EINVAL;
370 } 369 }
371 370
@@ -388,7 +387,7 @@ int i915_irq_wait(struct drm_device *dev, void *data,
388 drm_i915_irq_wait_t *irqwait = data; 387 drm_i915_irq_wait_t *irqwait = data;
389 388
390 if (!dev_priv) { 389 if (!dev_priv) {
391 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 390 DRM_ERROR("called with no initialization\n");
392 return -EINVAL; 391 return -EINVAL;
393 } 392 }
394 393
@@ -418,13 +417,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
418 drm_i915_vblank_pipe_t *pipe = data; 417 drm_i915_vblank_pipe_t *pipe = data;
419 418
420 if (!dev_priv) { 419 if (!dev_priv) {
421 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 420 DRM_ERROR("called with no initialization\n");
422 return -EINVAL; 421 return -EINVAL;
423 } 422 }
424 423
425 if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) { 424 if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {
426 DRM_ERROR("%s called with invalid pipe 0x%x\n", 425 DRM_ERROR("called with invalid pipe 0x%x\n", pipe->pipe);
427 __FUNCTION__, pipe->pipe);
428 return -EINVAL; 426 return -EINVAL;
429 } 427 }
430 428
@@ -443,7 +441,7 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
443 u16 flag; 441 u16 flag;
444 442
445 if (!dev_priv) { 443 if (!dev_priv) {
446 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 444 DRM_ERROR("called with no initialization\n");
447 return -EINVAL; 445 return -EINVAL;
448 } 446 }
449 447
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index d360896f38a6..6126a60dc9cb 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -276,7 +276,7 @@ int i915_mem_alloc(struct drm_device *dev, void *data,
276 struct mem_block *block, **heap; 276 struct mem_block *block, **heap;
277 277
278 if (!dev_priv) { 278 if (!dev_priv) {
279 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 279 DRM_ERROR("called with no initialization\n");
280 return -EINVAL; 280 return -EINVAL;
281 } 281 }
282 282
@@ -314,7 +314,7 @@ int i915_mem_free(struct drm_device *dev, void *data,
314 struct mem_block *block, **heap; 314 struct mem_block *block, **heap;
315 315
316 if (!dev_priv) { 316 if (!dev_priv) {
317 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 317 DRM_ERROR("called with no initialization\n");
318 return -EINVAL; 318 return -EINVAL;
319 } 319 }
320 320
@@ -342,7 +342,7 @@ int i915_mem_init_heap(struct drm_device *dev, void *data,
342 struct mem_block **heap; 342 struct mem_block **heap;
343 343
344 if (!dev_priv) { 344 if (!dev_priv) {
345 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 345 DRM_ERROR("called with no initialization\n");
346 return -EINVAL; 346 return -EINVAL;
347 } 347 }
348 348
@@ -366,7 +366,7 @@ int i915_mem_destroy_heap( struct drm_device *dev, void *data,
366 struct mem_block **heap; 366 struct mem_block **heap;
367 367
368 if ( !dev_priv ) { 368 if ( !dev_priv ) {
369 DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ ); 369 DRM_ERROR( "called with no initialization\n" );
370 return -EINVAL; 370 return -EINVAL;
371 } 371 }
372 372
diff --git a/drivers/char/drm/mga_dma.c b/drivers/char/drm/mga_dma.c
index 9d95f6078764..c1d12dbfa8d8 100644
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
@@ -1050,7 +1050,7 @@ int mga_dma_flush(struct drm_device *dev, void *data,
1050#if MGA_DMA_DEBUG 1050#if MGA_DMA_DEBUG
1051 int ret = mga_do_wait_for_idle(dev_priv); 1051 int ret = mga_do_wait_for_idle(dev_priv);
1052 if (ret < 0) 1052 if (ret < 0)
1053 DRM_INFO("%s: -EBUSY\n", __FUNCTION__); 1053 DRM_INFO("-EBUSY\n");
1054 return ret; 1054 return ret;
1055#else 1055#else
1056 return mga_do_wait_for_idle(dev_priv); 1056 return mga_do_wait_for_idle(dev_priv);
diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index 44a9e6619061..f6ebd24bd587 100644
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
@@ -249,7 +249,7 @@ do { \
249 } else if ( dev_priv->prim.space < \ 249 } else if ( dev_priv->prim.space < \
250 dev_priv->prim.high_mark ) { \ 250 dev_priv->prim.high_mark ) { \
251 if ( MGA_DMA_DEBUG ) \ 251 if ( MGA_DMA_DEBUG ) \
252 DRM_INFO( "%s: wrap...\n", __FUNCTION__ ); \ 252 DRM_INFO( "wrap...\n"); \
253 return -EBUSY; \ 253 return -EBUSY; \
254 } \ 254 } \
255 } \ 255 } \
@@ -260,7 +260,7 @@ do { \
260 if ( test_bit( 0, &dev_priv->prim.wrapped ) ) { \ 260 if ( test_bit( 0, &dev_priv->prim.wrapped ) ) { \
261 if ( mga_do_wait_for_idle( dev_priv ) < 0 ) { \ 261 if ( mga_do_wait_for_idle( dev_priv ) < 0 ) { \
262 if ( MGA_DMA_DEBUG ) \ 262 if ( MGA_DMA_DEBUG ) \
263 DRM_INFO( "%s: wrap...\n", __FUNCTION__ ); \ 263 DRM_INFO( "wrap...\n"); \
264 return -EBUSY; \ 264 return -EBUSY; \
265 } \ 265 } \
266 mga_do_dma_wrap_end( dev_priv ); \ 266 mga_do_dma_wrap_end( dev_priv ); \
@@ -280,8 +280,7 @@ do { \
280#define BEGIN_DMA( n ) \ 280#define BEGIN_DMA( n ) \
281do { \ 281do { \
282 if ( MGA_VERBOSE ) { \ 282 if ( MGA_VERBOSE ) { \
283 DRM_INFO( "BEGIN_DMA( %d ) in %s\n", \ 283 DRM_INFO( "BEGIN_DMA( %d )\n", (n) ); \
284 (n), __FUNCTION__ ); \
285 DRM_INFO( " space=0x%x req=0x%Zx\n", \ 284 DRM_INFO( " space=0x%x req=0x%Zx\n", \
286 dev_priv->prim.space, (n) * DMA_BLOCK_SIZE ); \ 285 dev_priv->prim.space, (n) * DMA_BLOCK_SIZE ); \
287 } \ 286 } \
@@ -292,7 +291,7 @@ do { \
292#define BEGIN_DMA_WRAP() \ 291#define BEGIN_DMA_WRAP() \
293do { \ 292do { \
294 if ( MGA_VERBOSE ) { \ 293 if ( MGA_VERBOSE ) { \
295 DRM_INFO( "BEGIN_DMA() in %s\n", __FUNCTION__ ); \ 294 DRM_INFO( "BEGIN_DMA()\n" ); \
296 DRM_INFO( " space=0x%x\n", dev_priv->prim.space ); \ 295 DRM_INFO( " space=0x%x\n", dev_priv->prim.space ); \
297 } \ 296 } \
298 prim = dev_priv->prim.start; \ 297 prim = dev_priv->prim.start; \
@@ -311,7 +310,7 @@ do { \
311#define FLUSH_DMA() \ 310#define FLUSH_DMA() \
312do { \ 311do { \
313 if ( 0 ) { \ 312 if ( 0 ) { \
314 DRM_INFO( "%s:\n", __FUNCTION__ ); \ 313 DRM_INFO( "\n" ); \
315 DRM_INFO( " tail=0x%06x head=0x%06lx\n", \ 314 DRM_INFO( " tail=0x%06x head=0x%06lx\n", \
316 dev_priv->prim.tail, \ 315 dev_priv->prim.tail, \
317 MGA_READ( MGA_PRIMADDRESS ) - \ 316 MGA_READ( MGA_PRIMADDRESS ) - \
diff --git a/drivers/char/drm/mga_state.c b/drivers/char/drm/mga_state.c
index 4cb95ecd465c..d3f8aade07b3 100644
--- a/drivers/char/drm/mga_state.c
+++ b/drivers/char/drm/mga_state.c
@@ -619,7 +619,7 @@ static void mga_dma_dispatch_swap(struct drm_device * dev)
619 619
620 FLUSH_DMA(); 620 FLUSH_DMA();
621 621
622 DRM_DEBUG("%s... done.\n", __FUNCTION__); 622 DRM_DEBUG("... done.\n");
623} 623}
624 624
625static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf) 625static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
@@ -631,7 +631,7 @@ static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * bu
631 u32 length = (u32) buf->used; 631 u32 length = (u32) buf->used;
632 int i = 0; 632 int i = 0;
633 DMA_LOCALS; 633 DMA_LOCALS;
634 DRM_DEBUG("vertex: buf=%d used=%d\n", buf->idx, buf->used); 634 DRM_DEBUG("buf=%d used=%d\n", buf->idx, buf->used);
635 635
636 if (buf->used) { 636 if (buf->used) {
637 buf_priv->dispatched = 1; 637 buf_priv->dispatched = 1;
@@ -678,7 +678,7 @@ static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * b
678 u32 address = (u32) buf->bus_address; 678 u32 address = (u32) buf->bus_address;
679 int i = 0; 679 int i = 0;
680 DMA_LOCALS; 680 DMA_LOCALS;
681 DRM_DEBUG("indices: buf=%d start=%d end=%d\n", buf->idx, start, end); 681 DRM_DEBUG("buf=%d start=%d end=%d\n", buf->idx, start, end);
682 682
683 if (start != end) { 683 if (start != end) {
684 buf_priv->dispatched = 1; 684 buf_priv->dispatched = 1;
@@ -955,7 +955,7 @@ static int mga_dma_iload(struct drm_device *dev, void *data, struct drm_file *fi
955#if 0 955#if 0
956 if (mga_do_wait_for_idle(dev_priv) < 0) { 956 if (mga_do_wait_for_idle(dev_priv) < 0) {
957 if (MGA_DMA_DEBUG) 957 if (MGA_DMA_DEBUG)
958 DRM_INFO("%s: -EBUSY\n", __FUNCTION__); 958 DRM_INFO("-EBUSY\n");
959 return -EBUSY; 959 return -EBUSY;
960 } 960 }
961#endif 961#endif
@@ -1014,7 +1014,7 @@ static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *fil
1014 int value; 1014 int value;
1015 1015
1016 if (!dev_priv) { 1016 if (!dev_priv) {
1017 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 1017 DRM_ERROR("called with no initialization\n");
1018 return -EINVAL; 1018 return -EINVAL;
1019 } 1019 }
1020 1020
@@ -1046,7 +1046,7 @@ static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *fi
1046 DMA_LOCALS; 1046 DMA_LOCALS;
1047 1047
1048 if (!dev_priv) { 1048 if (!dev_priv) {
1049 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 1049 DRM_ERROR("called with no initialization\n");
1050 return -EINVAL; 1050 return -EINVAL;
1051 } 1051 }
1052 1052
@@ -1075,7 +1075,7 @@ file_priv)
1075 u32 *fence = data; 1075 u32 *fence = data;
1076 1076
1077 if (!dev_priv) { 1077 if (!dev_priv) {
1078 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 1078 DRM_ERROR("called with no initialization\n");
1079 return -EINVAL; 1079 return -EINVAL;
1080 } 1080 }
1081 1081
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index 90972cc8628e..892e0a589846 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -651,7 +651,7 @@ int r128_cce_start(struct drm_device *dev, void *data, struct drm_file *file_pri
651 LOCK_TEST_WITH_RETURN(dev, file_priv); 651 LOCK_TEST_WITH_RETURN(dev, file_priv);
652 652
653 if (dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4) { 653 if (dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4) {
654 DRM_DEBUG("%s while CCE running\n", __FUNCTION__); 654 DRM_DEBUG("while CCE running\n");
655 return 0; 655 return 0;
656 } 656 }
657 657
@@ -710,7 +710,7 @@ int r128_cce_reset(struct drm_device *dev, void *data, struct drm_file *file_pri
710 LOCK_TEST_WITH_RETURN(dev, file_priv); 710 LOCK_TEST_WITH_RETURN(dev, file_priv);
711 711
712 if (!dev_priv) { 712 if (!dev_priv) {
713 DRM_DEBUG("%s called before init done\n", __FUNCTION__); 713 DRM_DEBUG("called before init done\n");
714 return -EINVAL; 714 return -EINVAL;
715 } 715 }
716 716
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index a53082e9dcc1..011105e51ac6 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -462,8 +462,7 @@ do { \
462 462
463#define BEGIN_RING( n ) do { \ 463#define BEGIN_RING( n ) do { \
464 if ( R128_VERBOSE ) { \ 464 if ( R128_VERBOSE ) { \
465 DRM_INFO( "BEGIN_RING( %d ) in %s\n", \ 465 DRM_INFO( "BEGIN_RING( %d )\n", (n)); \
466 (n), __FUNCTION__ ); \
467 } \ 466 } \
468 if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \ 467 if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \
469 COMMIT_RING(); \ 468 COMMIT_RING(); \
diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c
index b7f483cac6d4..51a9afce7b9b 100644
--- a/drivers/char/drm/r128_state.c
+++ b/drivers/char/drm/r128_state.c
@@ -42,7 +42,7 @@ static void r128_emit_clip_rects(drm_r128_private_t * dev_priv,
42{ 42{
43 u32 aux_sc_cntl = 0x00000000; 43 u32 aux_sc_cntl = 0x00000000;
44 RING_LOCALS; 44 RING_LOCALS;
45 DRM_DEBUG(" %s\n", __FUNCTION__); 45 DRM_DEBUG("\n");
46 46
47 BEGIN_RING((count < 3 ? count : 3) * 5 + 2); 47 BEGIN_RING((count < 3 ? count : 3) * 5 + 2);
48 48
@@ -85,7 +85,7 @@ static __inline__ void r128_emit_core(drm_r128_private_t * dev_priv)
85 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; 85 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
86 drm_r128_context_regs_t *ctx = &sarea_priv->context_state; 86 drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
87 RING_LOCALS; 87 RING_LOCALS;
88 DRM_DEBUG(" %s\n", __FUNCTION__); 88 DRM_DEBUG("\n");
89 89
90 BEGIN_RING(2); 90 BEGIN_RING(2);
91 91
@@ -100,7 +100,7 @@ static __inline__ void r128_emit_context(drm_r128_private_t * dev_priv)
100 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; 100 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
101 drm_r128_context_regs_t *ctx = &sarea_priv->context_state; 101 drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
102 RING_LOCALS; 102 RING_LOCALS;
103 DRM_DEBUG(" %s\n", __FUNCTION__); 103 DRM_DEBUG("\n");
104 104
105 BEGIN_RING(13); 105 BEGIN_RING(13);
106 106
@@ -126,7 +126,7 @@ static __inline__ void r128_emit_setup(drm_r128_private_t * dev_priv)
126 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; 126 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
127 drm_r128_context_regs_t *ctx = &sarea_priv->context_state; 127 drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
128 RING_LOCALS; 128 RING_LOCALS;
129 DRM_DEBUG(" %s\n", __FUNCTION__); 129 DRM_DEBUG("\n");
130 130
131 BEGIN_RING(3); 131 BEGIN_RING(3);
132 132
@@ -142,7 +142,7 @@ static __inline__ void r128_emit_masks(drm_r128_private_t * dev_priv)
142 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; 142 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
143 drm_r128_context_regs_t *ctx = &sarea_priv->context_state; 143 drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
144 RING_LOCALS; 144 RING_LOCALS;
145 DRM_DEBUG(" %s\n", __FUNCTION__); 145 DRM_DEBUG("\n");
146 146
147 BEGIN_RING(5); 147 BEGIN_RING(5);
148 148
@@ -161,7 +161,7 @@ static __inline__ void r128_emit_window(drm_r128_private_t * dev_priv)
161 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; 161 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
162 drm_r128_context_regs_t *ctx = &sarea_priv->context_state; 162 drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
163 RING_LOCALS; 163 RING_LOCALS;
164 DRM_DEBUG(" %s\n", __FUNCTION__); 164 DRM_DEBUG("\n");
165 165
166 BEGIN_RING(2); 166 BEGIN_RING(2);
167 167
@@ -178,7 +178,7 @@ static __inline__ void r128_emit_tex0(drm_r128_private_t * dev_priv)
178 drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[0]; 178 drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[0];
179 int i; 179 int i;
180 RING_LOCALS; 180 RING_LOCALS;
181 DRM_DEBUG(" %s\n", __FUNCTION__); 181 DRM_DEBUG("\n");
182 182
183 BEGIN_RING(7 + R128_MAX_TEXTURE_LEVELS); 183 BEGIN_RING(7 + R128_MAX_TEXTURE_LEVELS);
184 184
@@ -204,7 +204,7 @@ static __inline__ void r128_emit_tex1(drm_r128_private_t * dev_priv)
204 drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1]; 204 drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1];
205 int i; 205 int i;
206 RING_LOCALS; 206 RING_LOCALS;
207 DRM_DEBUG(" %s\n", __FUNCTION__); 207 DRM_DEBUG("\n");
208 208
209 BEGIN_RING(5 + R128_MAX_TEXTURE_LEVELS); 209 BEGIN_RING(5 + R128_MAX_TEXTURE_LEVELS);
210 210
@@ -226,7 +226,7 @@ static void r128_emit_state(drm_r128_private_t * dev_priv)
226 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; 226 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
227 unsigned int dirty = sarea_priv->dirty; 227 unsigned int dirty = sarea_priv->dirty;
228 228
229 DRM_DEBUG("%s: dirty=0x%08x\n", __FUNCTION__, dirty); 229 DRM_DEBUG("dirty=0x%08x\n", dirty);
230 230
231 if (dirty & R128_UPLOAD_CORE) { 231 if (dirty & R128_UPLOAD_CORE) {
232 r128_emit_core(dev_priv); 232 r128_emit_core(dev_priv);
@@ -362,7 +362,7 @@ static void r128_cce_dispatch_clear(struct drm_device * dev,
362 unsigned int flags = clear->flags; 362 unsigned int flags = clear->flags;
363 int i; 363 int i;
364 RING_LOCALS; 364 RING_LOCALS;
365 DRM_DEBUG("%s\n", __FUNCTION__); 365 DRM_DEBUG("\n");
366 366
367 if (dev_priv->page_flipping && dev_priv->current_page == 1) { 367 if (dev_priv->page_flipping && dev_priv->current_page == 1) {
368 unsigned int tmp = flags; 368 unsigned int tmp = flags;
@@ -466,7 +466,7 @@ static void r128_cce_dispatch_swap(struct drm_device * dev)
466 struct drm_clip_rect *pbox = sarea_priv->boxes; 466 struct drm_clip_rect *pbox = sarea_priv->boxes;
467 int i; 467 int i;
468 RING_LOCALS; 468 RING_LOCALS;
469 DRM_DEBUG("%s\n", __FUNCTION__); 469 DRM_DEBUG("\n");
470 470
471#if R128_PERFORMANCE_BOXES 471#if R128_PERFORMANCE_BOXES
472 /* Do some trivial performance monitoring... 472 /* Do some trivial performance monitoring...
@@ -528,8 +528,7 @@ static void r128_cce_dispatch_flip(struct drm_device * dev)
528{ 528{
529 drm_r128_private_t *dev_priv = dev->dev_private; 529 drm_r128_private_t *dev_priv = dev->dev_private;
530 RING_LOCALS; 530 RING_LOCALS;
531 DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n", 531 DRM_DEBUG("page=%d pfCurrentPage=%d\n",
532 __FUNCTION__,
533 dev_priv->current_page, dev_priv->sarea_priv->pfCurrentPage); 532 dev_priv->current_page, dev_priv->sarea_priv->pfCurrentPage);
534 533
535#if R128_PERFORMANCE_BOXES 534#if R128_PERFORMANCE_BOXES
@@ -1156,7 +1155,7 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
1156 int count, *x, *y; 1155 int count, *x, *y;
1157 int i, xbuf_size, ybuf_size; 1156 int i, xbuf_size, ybuf_size;
1158 RING_LOCALS; 1157 RING_LOCALS;
1159 DRM_DEBUG("%s\n", __FUNCTION__); 1158 DRM_DEBUG("\n");
1160 1159
1161 count = depth->n; 1160 count = depth->n;
1162 if (count > 4096 || count <= 0) 1161 if (count > 4096 || count <= 0)
@@ -1226,7 +1225,7 @@ static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)
1226 drm_r128_private_t *dev_priv = dev->dev_private; 1225 drm_r128_private_t *dev_priv = dev->dev_private;
1227 int i; 1226 int i;
1228 RING_LOCALS; 1227 RING_LOCALS;
1229 DRM_DEBUG("%s\n", __FUNCTION__); 1228 DRM_DEBUG("\n");
1230 1229
1231 BEGIN_RING(33); 1230 BEGIN_RING(33);
1232 1231
@@ -1309,7 +1308,7 @@ static int r128_do_cleanup_pageflip(struct drm_device * dev)
1309static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *file_priv) 1308static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *file_priv)
1310{ 1309{
1311 drm_r128_private_t *dev_priv = dev->dev_private; 1310 drm_r128_private_t *dev_priv = dev->dev_private;
1312 DRM_DEBUG("%s\n", __FUNCTION__); 1311 DRM_DEBUG("\n");
1313 1312
1314 LOCK_TEST_WITH_RETURN(dev, file_priv); 1313 LOCK_TEST_WITH_RETURN(dev, file_priv);
1315 1314
@@ -1328,7 +1327,7 @@ static int r128_cce_swap(struct drm_device *dev, void *data, struct drm_file *fi
1328{ 1327{
1329 drm_r128_private_t *dev_priv = dev->dev_private; 1328 drm_r128_private_t *dev_priv = dev->dev_private;
1330 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; 1329 drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
1331 DRM_DEBUG("%s\n", __FUNCTION__); 1330 DRM_DEBUG("\n");
1332 1331
1333 LOCK_TEST_WITH_RETURN(dev, file_priv); 1332 LOCK_TEST_WITH_RETURN(dev, file_priv);
1334 1333
@@ -1356,7 +1355,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *
1356 LOCK_TEST_WITH_RETURN(dev, file_priv); 1355 LOCK_TEST_WITH_RETURN(dev, file_priv);
1357 1356
1358 if (!dev_priv) { 1357 if (!dev_priv) {
1359 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 1358 DRM_ERROR("called with no initialization\n");
1360 return -EINVAL; 1359 return -EINVAL;
1361 } 1360 }
1362 1361
@@ -1412,7 +1411,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_file
1412 LOCK_TEST_WITH_RETURN(dev, file_priv); 1411 LOCK_TEST_WITH_RETURN(dev, file_priv);
1413 1412
1414 if (!dev_priv) { 1413 if (!dev_priv) {
1415 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 1414 DRM_ERROR("called with no initialization\n");
1416 return -EINVAL; 1415 return -EINVAL;
1417 } 1416 }
1418 1417
@@ -1557,11 +1556,11 @@ static int r128_cce_indirect(struct drm_device *dev, void *data, struct drm_file
1557 LOCK_TEST_WITH_RETURN(dev, file_priv); 1556 LOCK_TEST_WITH_RETURN(dev, file_priv);
1558 1557
1559 if (!dev_priv) { 1558 if (!dev_priv) {
1560 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 1559 DRM_ERROR("called with no initialization\n");
1561 return -EINVAL; 1560 return -EINVAL;
1562 } 1561 }
1563 1562
1564 DRM_DEBUG("indirect: idx=%d s=%d e=%d d=%d\n", 1563 DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
1565 indirect->idx, indirect->start, indirect->end, 1564 indirect->idx, indirect->start, indirect->end,
1566 indirect->discard); 1565 indirect->discard);
1567 1566
@@ -1622,7 +1621,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
1622 int value; 1621 int value;
1623 1622
1624 if (!dev_priv) { 1623 if (!dev_priv) {
1625 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 1624 DRM_ERROR("called with no initialization\n");
1626 return -EINVAL; 1625 return -EINVAL;
1627 } 1626 }
1628 1627
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index df223020f0ae..e16294c039e4 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1852,12 +1852,12 @@ int radeon_cp_start(struct drm_device *dev, void *data, struct drm_file *file_pr
1852 LOCK_TEST_WITH_RETURN(dev, file_priv); 1852 LOCK_TEST_WITH_RETURN(dev, file_priv);
1853 1853
1854 if (dev_priv->cp_running) { 1854 if (dev_priv->cp_running) {
1855 DRM_DEBUG("%s while CP running\n", __FUNCTION__); 1855 DRM_DEBUG("while CP running\n");
1856 return 0; 1856 return 0;
1857 } 1857 }
1858 if (dev_priv->cp_mode == RADEON_CSQ_PRIDIS_INDDIS) { 1858 if (dev_priv->cp_mode == RADEON_CSQ_PRIDIS_INDDIS) {
1859 DRM_DEBUG("%s called with bogus CP mode (%d)\n", 1859 DRM_DEBUG("called with bogus CP mode (%d)\n",
1860 __FUNCTION__, dev_priv->cp_mode); 1860 dev_priv->cp_mode);
1861 return 0; 1861 return 0;
1862 } 1862 }
1863 1863
@@ -1962,7 +1962,7 @@ int radeon_cp_reset(struct drm_device *dev, void *data, struct drm_file *file_pr
1962 LOCK_TEST_WITH_RETURN(dev, file_priv); 1962 LOCK_TEST_WITH_RETURN(dev, file_priv);
1963 1963
1964 if (!dev_priv) { 1964 if (!dev_priv) {
1965 DRM_DEBUG("%s called before init done\n", __FUNCTION__); 1965 DRM_DEBUG("called before init done\n");
1966 return -EINVAL; 1966 return -EINVAL;
1967 } 1967 }
1968 1968
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index aae030844aef..8ce4940aba75 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -1114,8 +1114,7 @@ do { \
1114 1114
1115#define BEGIN_RING( n ) do { \ 1115#define BEGIN_RING( n ) do { \
1116 if ( RADEON_VERBOSE ) { \ 1116 if ( RADEON_VERBOSE ) { \
1117 DRM_INFO( "BEGIN_RING( %d ) in %s\n", \ 1117 DRM_INFO( "BEGIN_RING( %d )\n", (n)); \
1118 n, __FUNCTION__ ); \
1119 } \ 1118 } \
1120 if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \ 1119 if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \
1121 COMMIT_RING(); \ 1120 COMMIT_RING(); \
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index 84f5bc36252b..009af3814b6f 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -154,7 +154,7 @@ static int radeon_driver_vblank_do_wait(struct drm_device * dev,
154 int ack = 0; 154 int ack = 0;
155 atomic_t *counter; 155 atomic_t *counter;
156 if (!dev_priv) { 156 if (!dev_priv) {
157 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 157 DRM_ERROR("called with no initialization\n");
158 return -EINVAL; 158 return -EINVAL;
159 } 159 }
160 160
@@ -205,7 +205,7 @@ int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_pr
205 LOCK_TEST_WITH_RETURN(dev, file_priv); 205 LOCK_TEST_WITH_RETURN(dev, file_priv);
206 206
207 if (!dev_priv) { 207 if (!dev_priv) {
208 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 208 DRM_ERROR("called with no initialization\n");
209 return -EINVAL; 209 return -EINVAL;
210 } 210 }
211 211
@@ -227,7 +227,7 @@ int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_pr
227 drm_radeon_irq_wait_t *irqwait = data; 227 drm_radeon_irq_wait_t *irqwait = data;
228 228
229 if (!dev_priv) { 229 if (!dev_priv) {
230 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 230 DRM_ERROR("called with no initialization\n");
231 return -EINVAL; 231 return -EINVAL;
232 } 232 }
233 233
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c
index a29acfe2f973..78b34fa7c89a 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/char/drm/radeon_mem.c
@@ -224,7 +224,7 @@ int radeon_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_p
224 struct mem_block *block, **heap; 224 struct mem_block *block, **heap;
225 225
226 if (!dev_priv) { 226 if (!dev_priv) {
227 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 227 DRM_ERROR("called with no initialization\n");
228 return -EINVAL; 228 return -EINVAL;
229 } 229 }
230 230
@@ -259,7 +259,7 @@ int radeon_mem_free(struct drm_device *dev, void *data, struct drm_file *file_pr
259 struct mem_block *block, **heap; 259 struct mem_block *block, **heap;
260 260
261 if (!dev_priv) { 261 if (!dev_priv) {
262 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 262 DRM_ERROR("called with no initialization\n");
263 return -EINVAL; 263 return -EINVAL;
264 } 264 }
265 265
@@ -285,7 +285,7 @@ int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *fi
285 struct mem_block **heap; 285 struct mem_block **heap;
286 286
287 if (!dev_priv) { 287 if (!dev_priv) {
288 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 288 DRM_ERROR("called with no initialization\n");
289 return -EINVAL; 289 return -EINVAL;
290 } 290 }
291 291
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index f824f2f5fdc2..1dffdc3e7ef0 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -898,7 +898,7 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,
898 int w = pbox[i].x2 - x; 898 int w = pbox[i].x2 - x;
899 int h = pbox[i].y2 - y; 899 int h = pbox[i].y2 - y;
900 900
901 DRM_DEBUG("dispatch clear %d,%d-%d,%d flags 0x%x\n", 901 DRM_DEBUG("%d,%d-%d,%d flags 0x%x\n",
902 x, y, w, h, flags); 902 x, y, w, h, flags);
903 903
904 if (flags & RADEON_FRONT) { 904 if (flags & RADEON_FRONT) {
@@ -1368,7 +1368,7 @@ static void radeon_cp_dispatch_swap(struct drm_device * dev)
1368 int w = pbox[i].x2 - x; 1368 int w = pbox[i].x2 - x;
1369 int h = pbox[i].y2 - y; 1369 int h = pbox[i].y2 - y;
1370 1370
1371 DRM_DEBUG("dispatch swap %d,%d-%d,%d\n", x, y, w, h); 1371 DRM_DEBUG("%d,%d-%d,%d\n", x, y, w, h);
1372 1372
1373 BEGIN_RING(9); 1373 BEGIN_RING(9);
1374 1374
@@ -1422,8 +1422,7 @@ static void radeon_cp_dispatch_flip(struct drm_device * dev)
1422 int offset = (dev_priv->sarea_priv->pfCurrentPage == 1) 1422 int offset = (dev_priv->sarea_priv->pfCurrentPage == 1)
1423 ? dev_priv->front_offset : dev_priv->back_offset; 1423 ? dev_priv->front_offset : dev_priv->back_offset;
1424 RING_LOCALS; 1424 RING_LOCALS;
1425 DRM_DEBUG("%s: pfCurrentPage=%d\n", 1425 DRM_DEBUG("pfCurrentPage=%d\n",
1426 __FUNCTION__,
1427 dev_priv->sarea_priv->pfCurrentPage); 1426 dev_priv->sarea_priv->pfCurrentPage);
1428 1427
1429 /* Do some trivial performance monitoring... 1428 /* Do some trivial performance monitoring...
@@ -1562,7 +1561,7 @@ static void radeon_cp_dispatch_indirect(struct drm_device * dev,
1562{ 1561{
1563 drm_radeon_private_t *dev_priv = dev->dev_private; 1562 drm_radeon_private_t *dev_priv = dev->dev_private;
1564 RING_LOCALS; 1563 RING_LOCALS;
1565 DRM_DEBUG("indirect: buf=%d s=0x%x e=0x%x\n", buf->idx, start, end); 1564 DRM_DEBUG("buf=%d s=0x%x e=0x%x\n", buf->idx, start, end);
1566 1565
1567 if (start != end) { 1566 if (start != end) {
1568 int offset = (dev_priv->gart_buffers_offset 1567 int offset = (dev_priv->gart_buffers_offset
@@ -1758,7 +1757,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,
1758 buf = radeon_freelist_get(dev); 1757 buf = radeon_freelist_get(dev);
1759 } 1758 }
1760 if (!buf) { 1759 if (!buf) {
1761 DRM_DEBUG("radeon_cp_dispatch_texture: EAGAIN\n"); 1760 DRM_DEBUG("EAGAIN\n");
1762 if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image))) 1761 if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image)))
1763 return -EFAULT; 1762 return -EFAULT;
1764 return -EAGAIN; 1763 return -EAGAIN;
@@ -2413,7 +2412,7 @@ static int radeon_cp_indirect(struct drm_device *dev, void *data, struct drm_fil
2413 2412
2414 LOCK_TEST_WITH_RETURN(dev, file_priv); 2413 LOCK_TEST_WITH_RETURN(dev, file_priv);
2415 2414
2416 DRM_DEBUG("indirect: idx=%d s=%d e=%d d=%d\n", 2415 DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
2417 indirect->idx, indirect->start, indirect->end, 2416 indirect->idx, indirect->start, indirect->end,
2418 indirect->discard); 2417 indirect->discard);
2419 2418
@@ -2779,7 +2778,7 @@ static int radeon_emit_wait(struct drm_device * dev, int flags)
2779 drm_radeon_private_t *dev_priv = dev->dev_private; 2778 drm_radeon_private_t *dev_priv = dev->dev_private;
2780 RING_LOCALS; 2779 RING_LOCALS;
2781 2780
2782 DRM_DEBUG("%s: %x\n", __FUNCTION__, flags); 2781 DRM_DEBUG("%x\n", flags);
2783 switch (flags) { 2782 switch (flags) {
2784 case RADEON_WAIT_2D: 2783 case RADEON_WAIT_2D:
2785 BEGIN_RING(2); 2784 BEGIN_RING(2);
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 42836f4104ea..b3878770fce1 100644
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -115,7 +115,7 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file
115 dev_priv->vram_offset = fb->offset; 115 dev_priv->vram_offset = fb->offset;
116 116
117 mutex_unlock(&dev->struct_mutex); 117 mutex_unlock(&dev->struct_mutex);
118 DRM_DEBUG("offset = %u, size = %u", fb->offset, fb->size); 118 DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
119 119
120 return 0; 120 return 0;
121} 121}
@@ -205,7 +205,7 @@ static int sis_ioctl_agp_init(struct drm_device *dev, void *data,
205 dev_priv->agp_offset = agp->offset; 205 dev_priv->agp_offset = agp->offset;
206 mutex_unlock(&dev->struct_mutex); 206 mutex_unlock(&dev->struct_mutex);
207 207
208 DRM_DEBUG("offset = %u, size = %u", agp->offset, agp->size); 208 DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
209 return 0; 209 return 0;
210} 210}
211 211
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
index 7009dbddac43..94baec692b57 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
@@ -179,14 +179,12 @@ static int via_initialize(struct drm_device * dev,
179 } 179 }
180 180
181 if (dev_priv->ring.virtual_start != NULL) { 181 if (dev_priv->ring.virtual_start != NULL) {
182 DRM_ERROR("%s called again without calling cleanup\n", 182 DRM_ERROR("called again without calling cleanup\n");
183 __FUNCTION__);
184 return -EFAULT; 183 return -EFAULT;
185 } 184 }
186 185
187 if (!dev->agp || !dev->agp->base) { 186 if (!dev->agp || !dev->agp->base) {
188 DRM_ERROR("%s called with no agp memory available\n", 187 DRM_ERROR("called with no agp memory available\n");
189 __FUNCTION__);
190 return -EFAULT; 188 return -EFAULT;
191 } 189 }
192 190
@@ -267,8 +265,7 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t *
267 dev_priv = (drm_via_private_t *) dev->dev_private; 265 dev_priv = (drm_via_private_t *) dev->dev_private;
268 266
269 if (dev_priv->ring.virtual_start == NULL) { 267 if (dev_priv->ring.virtual_start == NULL) {
270 DRM_ERROR("%s called without initializing AGP ring buffer.\n", 268 DRM_ERROR("called without initializing AGP ring buffer.\n");
271 __FUNCTION__);
272 return -EFAULT; 269 return -EFAULT;
273 } 270 }
274 271
@@ -337,8 +334,7 @@ static int via_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *fi
337 334
338 LOCK_TEST_WITH_RETURN(dev, file_priv); 335 LOCK_TEST_WITH_RETURN(dev, file_priv);
339 336
340 DRM_DEBUG("via cmdbuffer, buf %p size %lu\n", cmdbuf->buf, 337 DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);
341 cmdbuf->size);
342 338
343 ret = via_dispatch_cmdbuffer(dev, cmdbuf); 339 ret = via_dispatch_cmdbuffer(dev, cmdbuf);
344 if (ret) { 340 if (ret) {
@@ -379,8 +375,7 @@ static int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file
379 375
380 LOCK_TEST_WITH_RETURN(dev, file_priv); 376 LOCK_TEST_WITH_RETURN(dev, file_priv);
381 377
382 DRM_DEBUG("via_pci_cmdbuffer, buf %p size %lu\n", cmdbuf->buf, 378 DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);
383 cmdbuf->size);
384 379
385 ret = via_dispatch_pci_cmdbuffer(dev, cmdbuf); 380 ret = via_dispatch_pci_cmdbuffer(dev, cmdbuf);
386 if (ret) { 381 if (ret) {
@@ -648,14 +643,13 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *
648 uint32_t tmp_size, count; 643 uint32_t tmp_size, count;
649 drm_via_private_t *dev_priv; 644 drm_via_private_t *dev_priv;
650 645
651 DRM_DEBUG("via cmdbuf_size\n"); 646 DRM_DEBUG("\n");
652 LOCK_TEST_WITH_RETURN(dev, file_priv); 647 LOCK_TEST_WITH_RETURN(dev, file_priv);
653 648
654 dev_priv = (drm_via_private_t *) dev->dev_private; 649 dev_priv = (drm_via_private_t *) dev->dev_private;
655 650
656 if (dev_priv->ring.virtual_start == NULL) { 651 if (dev_priv->ring.virtual_start == NULL) {
657 DRM_ERROR("%s called without initializing AGP ring buffer.\n", 652 DRM_ERROR("called without initializing AGP ring buffer.\n");
658 __FUNCTION__);
659 return -EFAULT; 653 return -EFAULT;
660 } 654 }
661 655
diff --git a/drivers/char/drm/via_irq.c b/drivers/char/drm/via_irq.c
index 9c1d52bc92d7..c6bb978a1106 100644
--- a/drivers/char/drm/via_irq.c
+++ b/drivers/char/drm/via_irq.c
@@ -169,9 +169,9 @@ int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)
169 unsigned int cur_vblank; 169 unsigned int cur_vblank;
170 int ret = 0; 170 int ret = 0;
171 171
172 DRM_DEBUG("viadrv_vblank_wait\n"); 172 DRM_DEBUG("\n");
173 if (!dev_priv) { 173 if (!dev_priv) {
174 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 174 DRM_ERROR("called with no initialization\n");
175 return -EINVAL; 175 return -EINVAL;
176 } 176 }
177 177
@@ -201,24 +201,23 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc
201 maskarray_t *masks; 201 maskarray_t *masks;
202 int real_irq; 202 int real_irq;
203 203
204 DRM_DEBUG("%s\n", __FUNCTION__); 204 DRM_DEBUG("\n");
205 205
206 if (!dev_priv) { 206 if (!dev_priv) {
207 DRM_ERROR("%s called with no initialization\n", __FUNCTION__); 207 DRM_ERROR("called with no initialization\n");
208 return -EINVAL; 208 return -EINVAL;
209 } 209 }
210 210
211 if (irq >= drm_via_irq_num) { 211 if (irq >= drm_via_irq_num) {
212 DRM_ERROR("%s Trying to wait on unknown irq %d\n", __FUNCTION__, 212 DRM_ERROR("Trying to wait on unknown irq %d\n", irq);
213 irq);
214 return -EINVAL; 213 return -EINVAL;
215 } 214 }
216 215
217 real_irq = dev_priv->irq_map[irq]; 216 real_irq = dev_priv->irq_map[irq];
218 217
219 if (real_irq < 0) { 218 if (real_irq < 0) {
220 DRM_ERROR("%s Video IRQ %d not available on this hardware.\n", 219 DRM_ERROR("Video IRQ %d not available on this hardware.\n",
221 __FUNCTION__, irq); 220 irq);
222 return -EINVAL; 221 return -EINVAL;
223 } 222 }
224 223
@@ -251,7 +250,7 @@ void via_driver_irq_preinstall(struct drm_device * dev)
251 drm_via_irq_t *cur_irq; 250 drm_via_irq_t *cur_irq;
252 int i; 251 int i;
253 252
254 DRM_DEBUG("driver_irq_preinstall: dev_priv: %p\n", dev_priv); 253 DRM_DEBUG("dev_priv: %p\n", dev_priv);
255 if (dev_priv) { 254 if (dev_priv) {
256 cur_irq = dev_priv->via_irqs; 255 cur_irq = dev_priv->via_irqs;
257 256
@@ -298,7 +297,7 @@ void via_driver_irq_postinstall(struct drm_device * dev)
298 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 297 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
299 u32 status; 298 u32 status;
300 299
301 DRM_DEBUG("via_driver_irq_postinstall\n"); 300 DRM_DEBUG("\n");
302 if (dev_priv) { 301 if (dev_priv) {
303 status = VIA_READ(VIA_REG_INTERRUPT); 302 status = VIA_READ(VIA_REG_INTERRUPT);
304 VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL 303 VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL
@@ -317,7 +316,7 @@ void via_driver_irq_uninstall(struct drm_device * dev)
317 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 316 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
318 u32 status; 317 u32 status;
319 318
320 DRM_DEBUG("driver_irq_uninstall)\n"); 319 DRM_DEBUG("\n");
321 if (dev_priv) { 320 if (dev_priv) {
322 321
323 /* Some more magic, oh for some data sheets ! */ 322 /* Some more magic, oh for some data sheets ! */
@@ -344,7 +343,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
344 return -EINVAL; 343 return -EINVAL;
345 344
346 if (irqwait->request.irq >= dev_priv->num_irqs) { 345 if (irqwait->request.irq >= dev_priv->num_irqs) {
347 DRM_ERROR("%s Trying to wait on unknown irq %d\n", __FUNCTION__, 346 DRM_ERROR("Trying to wait on unknown irq %d\n",
348 irqwait->request.irq); 347 irqwait->request.irq);
349 return -EINVAL; 348 return -EINVAL;
350 } 349 }
@@ -362,8 +361,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
362 } 361 }
363 362
364 if (irqwait->request.type & VIA_IRQ_SIGNAL) { 363 if (irqwait->request.type & VIA_IRQ_SIGNAL) {
365 DRM_ERROR("%s Signals on Via IRQs not implemented yet.\n", 364 DRM_ERROR("Signals on Via IRQs not implemented yet.\n");
366 __FUNCTION__);
367 return -EINVAL; 365 return -EINVAL;
368 } 366 }
369 367
diff --git a/drivers/char/drm/via_map.c b/drivers/char/drm/via_map.c
index f6dcaaf043fe..a967556be014 100644
--- a/drivers/char/drm/via_map.c
+++ b/drivers/char/drm/via_map.c
@@ -29,7 +29,7 @@ static int via_do_init_map(struct drm_device * dev, drm_via_init_t * init)
29{ 29{
30 drm_via_private_t *dev_priv = dev->dev_private; 30 drm_via_private_t *dev_priv = dev->dev_private;
31 31
32 DRM_DEBUG("%s\n", __FUNCTION__); 32 DRM_DEBUG("\n");
33 33
34 dev_priv->sarea = drm_getsarea(dev); 34 dev_priv->sarea = drm_getsarea(dev);
35 if (!dev_priv->sarea) { 35 if (!dev_priv->sarea) {
@@ -79,7 +79,7 @@ int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
79{ 79{
80 drm_via_init_t *init = data; 80 drm_via_init_t *init = data;
81 81
82 DRM_DEBUG("%s\n", __FUNCTION__); 82 DRM_DEBUG("\n");
83 83
84 switch (init->func) { 84 switch (init->func) {
85 case VIA_INIT_MAP: 85 case VIA_INIT_MAP:
diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index 69f655848a30..e64094916e4f 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -53,7 +53,7 @@ int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
53 dev_priv->agp_offset = agp->offset; 53 dev_priv->agp_offset = agp->offset;
54 mutex_unlock(&dev->struct_mutex); 54 mutex_unlock(&dev->struct_mutex);
55 55
56 DRM_DEBUG("offset = %u, size = %u", agp->offset, agp->size); 56 DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
57 return 0; 57 return 0;
58} 58}
59 59
@@ -77,7 +77,7 @@ int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
77 dev_priv->vram_offset = fb->offset; 77 dev_priv->vram_offset = fb->offset;
78 78
79 mutex_unlock(&dev->struct_mutex); 79 mutex_unlock(&dev->struct_mutex);
80 DRM_DEBUG("offset = %u, size = %u", fb->offset, fb->size); 80 DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
81 81
82 return 0; 82 return 0;
83 83
diff --git a/drivers/char/drm/via_video.c b/drivers/char/drm/via_video.c
index c15e75b54cb1..6ec04ac12459 100644
--- a/drivers/char/drm/via_video.c
+++ b/drivers/char/drm/via_video.c
@@ -33,7 +33,7 @@ void via_init_futex(drm_via_private_t * dev_priv)
33{ 33{
34 unsigned int i; 34 unsigned int i;
35 35
36 DRM_DEBUG("%s\n", __FUNCTION__); 36 DRM_DEBUG("\n");
37 37
38 for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) { 38 for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
39 DRM_INIT_WAITQUEUE(&(dev_priv->decoder_queue[i])); 39 DRM_INIT_WAITQUEUE(&(dev_priv->decoder_queue[i]));
@@ -73,7 +73,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_
73 drm_via_sarea_t *sAPriv = dev_priv->sarea_priv; 73 drm_via_sarea_t *sAPriv = dev_priv->sarea_priv;
74 int ret = 0; 74 int ret = 0;
75 75
76 DRM_DEBUG("%s\n", __FUNCTION__); 76 DRM_DEBUG("\n");
77 77
78 if (fx->lock > VIA_NR_XVMC_LOCKS) 78 if (fx->lock > VIA_NR_XVMC_LOCKS)
79 return -EFAULT; 79 return -EFAULT;