[PATCH xserver v2 7/9] xfree86: Remove a never-hit diagnostic message

[walter harms]

edidSize() checks for if (DDC->ver.version != 1) (see 6/9)
so this is bogus either ?

re,
 wh


Am 05.04.2016 19:54, schrieb Adam Jackson:
> Practically speaking, the EDID major version is never not 1.
> 
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  hw/xfree86/ddc/ddcProperty.c | 15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
> index a31e9c7..66e7ba8 100644
> --- a/hw/xfree86/ddc/ddcProperty.c
> +++ b/hw/xfree86/ddc/ddcProperty.c
> @@ -75,17 +75,10 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
>  {
>      int scrnIndex = pScrn->scrnIndex;
>  
> -    if (DDC->ver.version == 1) {
> -        if (xf86Initialising)
> -            edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC);
> -        else
> -            setRootWindowEDID(pScrn->pScreen, DDC);
> -    }
> -    else {
> -        xf86DrvMsg(scrnIndex, X_PROBED, "unexpected EDID version %d.%d\n",
> -                   DDC->ver.version, DDC->ver.revision);
> -        return;
> -    }
> +    if (xf86Initialising)
> +        edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC);
> +    else
> +        setRootWindowEDID(pScrn->pScreen, DDC);
>  }
>  
>  Bool