diff options
| author | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2007-01-06 08:21:36 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2007-01-06 08:21:36 -0800 |
| commit | 4c790f614ecba1f6468e51779cfaf0e36b6b17ad (patch) | |
| tree | a2086e8c07ef25b1d3e6d69490886b82d2d24911 /src/i830_video.c | |
| parent | 5a793b0dcf2d5de408b55073858fcfba6d99f994 (diff) | |
More sparse cleanups:
NULL vs. 0
make some variables static
remove redundant variables
There are only a few sparse warnings left now: some bitfield warnings
and a few 'mixing code and declarations' warnings from the ring macros.
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index f031a873..6b76faac 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -2695,13 +2695,13 @@ I830FreeSurface(XF86SurfacePtr surface) static int I830GetSurfaceAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 * value) { - return I830GetPortAttribute(pScrn, attribute, value, 0); + return I830GetPortAttribute(pScrn, attribute, value, NULL); } static int I830SetSurfaceAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 value) { - return I830SetPortAttribute(pScrn, attribute, value, 0); + return I830SetPortAttribute(pScrn, attribute, value, NULL); } static int @@ -2880,10 +2880,10 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on) /* Check we have an LFP connected */ if (i830PipeHasType(xf86_config->crtc[pPriv->pipe], I830_OUTPUT_LVDS)) { + int vtotal_reg = pPriv->pipe ? VTOTAL_A : VTOTAL_B; size = pPriv->pipe ? INREG(PIPEBSRC) : INREG(PIPEASRC); hsize = (size >> 16) & 0x7FF; vsize = size & 0x7FF; - int vtotal_reg = pPriv->pipe ? VTOTAL_A : VTOTAL_B; active = INREG(vtotal_reg) & 0x7FF; if (vsize < active && hsize > 1024) |