From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyrpo-0008W1-0X for qemu-devel@nongnu.org; Wed, 31 Aug 2011 16:56:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qyrpm-0004rF-Pu for qemu-devel@nongnu.org; Wed, 31 Aug 2011 16:56:31 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:48749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyrpm-0004r3-Ik for qemu-devel@nongnu.org; Wed, 31 Aug 2011 16:56:30 -0400 From: Peter Maydell Date: Wed, 31 Aug 2011 21:49:39 +0100 Message-Id: <1314823781-304-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1314823781-304-1-git-send-email-peter.maydell@linaro.org> References: <1314823781-304-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/3] usb: Remove leading underscores from __musb_irq_max List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , Gerd Hoffmann , patches@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 --- 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