diff options
author | Márton Németh <nm127@freemail.hu> | 2008-01-24 00:58:57 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 00:09:39 -0500 |
commit | 3e684eae586a9b210a4517da5637a255b1ff5a92 (patch) | |
tree | d8703d708e8fd37f0f1a74d9328e2da3faa555fc /drivers/char/drm/mga_drv.h | |
parent | 4d1f78880e9631fb08052dcc8e3341eecea537e0 (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/mga_drv.h')
-rw-r--r-- | drivers/char/drm/mga_drv.h | 11 |
1 files changed, 5 insertions, 6 deletions
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 ) \ |
281 | do { \ | 281 | do { \ |
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() \ |
293 | do { \ | 292 | do { \ |
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() \ |
312 | do { \ | 311 | do { \ |
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 ) - \ |