diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-24 15:15:43 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-24 15:15:43 -0200 |
| commit | 26ce0b163d9cf44ec1bc1d1bd460887aa5b405a7 (patch) | |
| tree | 5063cb22f76ece5925f2bbfa6713f978715b770a /src/smi_crtc.c | |
| parent | 2057d7ae05ef269f75a4d53fe5c4914a10856cb1 (diff) | |
Use a single debug macro for leaving functions.
The LEAVE() macro, when debug is disabled, now is defined as:
<hash>define LEAVE(...) return __VA_ARGS__
This avoids the requirement of a return statement after the LEAVE()
macro call, what can be confusing.
Diffstat (limited to 'src/smi_crtc.c')
| -rw-r--r-- | src/smi_crtc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/smi_crtc.c b/src/smi_crtc.c index fa2b097..c84e4c2 100644 --- a/src/smi_crtc.c +++ b/src/smi_crtc.c @@ -49,7 +49,7 @@ SMI_CrtcLock (xf86CrtcPtr crtc) WaitIdle(); - RETURN(FALSE); + LEAVE(FALSE); } static void @@ -71,7 +71,7 @@ SMI_CrtcModeFixup(xf86CrtcPtr crtc, /* Nothing */ - RETURN(TRUE); + LEAVE(TRUE); } static void @@ -138,7 +138,7 @@ SMI_CrtcShadowAllocate (xf86CrtcPtr crtc, int width, int height) result += offset * pSmi->Bpp; } - RETURN(result); + LEAVE(result); } static PixmapPtr @@ -152,7 +152,7 @@ SMI_CrtcShadowCreate (xf86CrtcPtr crtc, void *data, int width, int height) aligned_pitch = (width * pSmi->Bpp + 15) & ~15; - RETURN(GetScratchPixmapHeader(pScrn->pScreen,width,height,pScrn->depth, + LEAVE(GetScratchPixmapHeader(pScrn->pScreen,width,height,pScrn->depth, pScrn->bitsPerPixel,aligned_pitch,data)); } @@ -207,7 +207,7 @@ SMI_CrtcConfigResize(ScrnInfoPtr pScrn, if(!fbArea){ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "SMI_CrtcConfigResize: Not enough memory to resize the framebuffer\n"); - RETURN(FALSE); + LEAVE(FALSE); } if(pSmi->fbArea) @@ -243,7 +243,7 @@ SMI_CrtcConfigResize(ScrnInfoPtr pScrn, SMICRTC(crtc)->adjust_frame(crtc,crtc->x,crtc->y); } - RETURN(TRUE); + LEAVE(TRUE); } void @@ -280,8 +280,8 @@ SMI_CrtcPreInit(ScrnInfoPtr pScrn) xf86CrtcSetSizeRange(pScrn,128,128,4096,4096); if(SMI_MSOC_SERIES(pSmi->Chipset)){ - RETURN( SMI501_CrtcPreInit(pScrn) ); + LEAVE( SMI501_CrtcPreInit(pScrn) ); }else{ - RETURN( SMILynx_CrtcPreInit(pScrn) ); + LEAVE( SMILynx_CrtcPreInit(pScrn) ); } } |