Commit 9147b752 authored by Peter Maydell's avatar Peter Maydell Committed by Gerd Hoffmann
Browse files

usb: Remove leading underscores from __musb_irq_max 



Identifiers with double leading underscore are reserved, so rename
__musb_irq_max so we don't encroach on reserved namespace.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent d6791578

hw/tusb6010.c

+3 −3
Original line number Diff line number Diff line
@@ -785,9 +785,9 @@ static int tusb6010_init(SysBusDevice *dev) 
    sysbus_init_mmio_region(dev, &s->iomem[0]);

    sysbus_init_mmio_region(dev, &s->iomem[1]);

    sysbus_init_irq(dev, &s->irq);

    qdev_init_gpio_in(&dev->qdev, tusb6010_irq, __musb_irq_max + 1);

    musb_irqs = g_new0(qemu_irq, __musb_irq_max);

    for (i = 0; i < __musb_irq_max; i++) {

    qdev_init_gpio_in(&dev->qdev, tusb6010_irq, musb_irq_max + 1);

    musb_irqs = g_new0(qemu_irq, musb_irq_max);

    for (i = 0; i < musb_irq_max; i++) {

        musb_irqs[i] = qdev_get_gpio_in(&dev->qdev, i + 1);

    }

    s->musb = musb_init(musb_irqs);

hw/usb.h

+2 −1
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ enum musb_irq_source_e { 
    musb_irq_tx,

    musb_set_vbus,

    musb_set_session,

    __musb_irq_max,

    /* Add new interrupts here */

    musb_irq_max, /* total number of interrupts defined */

};



typedef struct MUSBState MUSBState;