diff options
| author | Eric Anholt <eric@anholt.net> | 2006-10-05 16:02:02 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-10-05 16:16:45 -0700 |
| commit | 9bb7736ab36f172db58703c4664bb1b0cd7f80c3 (patch) | |
| tree | ff913af4d4370a70c45702d1f6e1eb22b9ce6abd /src/i830_dvo.c | |
| parent | ada8f62da263d1e93e22df4e0b1149bf1dbe24d4 (diff) | |
Remove checks for output privates in various bits of code.
Now, the output is only set up if it fully initializes, so it will never exist
if the private it requires doesn't.
Diffstat (limited to 'src/i830_dvo.c')
| -rw-r--r-- | src/i830_dvo.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/i830_dvo.c b/src/i830_dvo.c index 86d7d73b..27f1755f 100644 --- a/src/i830_dvo.c +++ b/src/i830_dvo.c @@ -57,9 +57,6 @@ struct _I830DVODriver i830_dvo_drivers[] = static void i830_dvo_dpms(ScrnInfoPtr pScrn, I830OutputPtr output, int mode) { - if (output->i2c_drv == NULL) - return; - if (mode == DPMSModeOn) output->i2c_drv->vid_rec->Power(output->i2c_drv->dev_priv, TRUE); else @@ -71,9 +68,6 @@ i830_dvo_save(ScrnInfoPtr pScrn, I830OutputPtr output) { I830Ptr pI830 = I830PTR(pScrn); - if (output->i2c_drv == NULL) - return; - /* Each output should probably just save the registers it touches, but for * now, use more overkill. */ @@ -89,9 +83,6 @@ i830_dvo_restore(ScrnInfoPtr pScrn, I830OutputPtr output) { I830Ptr pI830 = I830PTR(pScrn); - if (output->i2c_drv == NULL) - return; - OUTREG(DVOA, pI830->saveDVOA); OUTREG(DVOB, pI830->saveDVOB); OUTREG(DVOC, pI830->saveDVOC); @@ -99,7 +90,7 @@ i830_dvo_restore(ScrnInfoPtr pScrn, I830OutputPtr output) output->i2c_drv->vid_rec->RestoreRegs(output->i2c_drv->dev_priv); } -Bool +static Bool I830I2CDetectDVOControllers(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus, struct _I830DVODriver **retdrv) { |