Commit fc38a112 authored by Peter Maydell's avatar Peter Maydell
Browse files

Remove checks on MAX_SERIAL_PORTS that are just bounds checks 



Remove checks on MAX_SERIAL_PORTS that were just checking whether
they were within bounds for the serial_hds[] array and falling
back to NULL if not. This isn't needed with the serial_hd()
function, which returns NULL for all indexes beyond what the
user set up.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180420145249.32435-9-peter.maydell@linaro.org
parent 9bca0edb

hw/arm/fsl-imx25.c

+1 −3
Original line number Diff line number Diff line
@@ -117,9 +117,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) 
            { FSL_IMX25_UART5_ADDR, FSL_IMX25_UART5_IRQ }

        };



        if (i < MAX_SERIAL_PORTS) {

        qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hd(i));

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);

        if (err) {

hw/arm/fsl-imx31.c

+1 −3
Original line number Diff line number Diff line
@@ -106,9 +106,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp) 
            { FSL_IMX31_UART2_ADDR, FSL_IMX31_UART2_IRQ },

        };



        if (i < MAX_SERIAL_PORTS) {

        qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hd(i));

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);

        if (err) {

hw/arm/fsl-imx6.c

+1 −3
Original line number Diff line number Diff line
@@ -188,9 +188,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) 
            { FSL_IMX6_UART5_ADDR, FSL_IMX6_UART5_IRQ },

        };



        if (i < MAX_SERIAL_PORTS) {

        qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hd(i));

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);

        if (err) {

hw/arm/fsl-imx7.c

+1 −3
Original line number Diff line number Diff line
@@ -390,9 +390,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) 
        };





        if (i < MAX_SERIAL_PORTS) {

        qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hd(i));

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized",

                                 &error_abort);

hw/arm/mps2-tz.c

+1 −2
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ static MemoryRegion *make_uart(MPS2TZMachineState *mms, void *opaque, 
{

    CMSDKAPBUART *uart = opaque;

    int i = uart - &mms->uart[0];

    Chardev *uartchr = i < MAX_SERIAL_PORTS ? serial_hd(i) : NULL;

    int rxirqno = i * 2;

    int txirqno = i * 2 + 1;

    int combirqno = i + 10;
@@ -182,7 +181,7 @@ static MemoryRegion *make_uart(MPS2TZMachineState *mms, void *opaque, 


    init_sysbus_child(OBJECT(mms), name, uart,

                      sizeof(mms->uart[0]), TYPE_CMSDK_APB_UART);

    qdev_prop_set_chr(DEVICE(uart), "chardev", uartchr);

    qdev_prop_set_chr(DEVICE(uart), "chardev", serial_hd(i));

    qdev_prop_set_uint32(DEVICE(uart), "pclk-frq", SYSCLK_FRQ);

    object_property_set_bool(OBJECT(uart), true, "realized", &error_fatal);

    s = SYS_BUS_DEVICE(uart);