sna: sna_set_desired_mode() always returns true, make it void
Since sna_set_desired_mode() always returns true, we can make it void and remove some unreachable code. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
parent
fb1643f0f9
commit
5fa114d945
|
|
@ -199,7 +199,7 @@ sna_set_fallback_mode(ScrnInfoPtr scrn)
|
|||
#endif
|
||||
}
|
||||
|
||||
static Bool sna_set_desired_mode(struct sna *sna)
|
||||
static void sna_set_desired_mode(struct sna *sna)
|
||||
{
|
||||
ScrnInfoPtr scrn = sna->scrn;
|
||||
|
||||
|
|
@ -212,7 +212,6 @@ static Bool sna_set_desired_mode(struct sna *sna)
|
|||
}
|
||||
|
||||
sna_mode_check(sna);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -282,7 +281,7 @@ static Bool sna_create_screen_resources(ScreenPtr screen)
|
|||
if (serverGeneration == 1 && (sna->flags & SNA_IS_HOSTED) == 0)
|
||||
sna_copy_fbcon(sna);
|
||||
|
||||
(void)sna_set_desired_mode(sna);
|
||||
sna_set_desired_mode(sna);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -1217,13 +1216,8 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
|
|||
sna_mode_discover(sna);
|
||||
sna->flags &= ~SNA_REPROBE;
|
||||
}
|
||||
sna_mode_check(sna);
|
||||
|
||||
if (!sna_set_desired_mode(sna)) {
|
||||
sna_accel_leave(sna);
|
||||
intel_put_master(sna->dev);
|
||||
return FALSE;
|
||||
}
|
||||
sna_set_desired_mode(sna);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue