aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/via_irq.c
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/drm/via_irq.c
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/drm/via_irq.c')
-rw-r--r--drivers/char/drm/via_irq.c26
1 files changed, 12 insertions, 14 deletions
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