[Qemu-devel] [PATCH 1/3] usb: Remove leading underscores from __musb_irq_max

[Peter Maydell <peter.maydell@linaro.org>]

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

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/tusb6010.c |    6 +++---
 hw/usb.h      |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hw/tusb6010.c b/hw/tusb6010.c
index de6ffc6..78814f1 100644
--- a/hw/tusb6010.c
+++ b/hw/tusb6010.c
@@ -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);
diff --git a/hw/usb.h b/hw/usb.h
index d784448..e7ce395 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -337,7 +337,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;
-- 
1.7.1