From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzQUr-0001Pc-8x for qemu-devel@nongnu.org; Fri, 02 Sep 2011 05:57:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzQUq-0002Eq-4t for qemu-devel@nongnu.org; Fri, 02 Sep 2011 05:57:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzQUp-0002Ed-Tl for qemu-devel@nongnu.org; Fri, 02 Sep 2011 05:57:12 -0400 From: Gerd Hoffmann Date: Fri, 2 Sep 2011 11:56:45 +0200 Message-Id: <1314957407-29508-17-git-send-email-kraxel@redhat.com> In-Reply-To: <1314957407-29508-1-git-send-email-kraxel@redhat.com> References: <1314957407-29508-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 16/18] 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: Peter Maydell , Gerd Hoffmann From: Peter Maydell 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 Signed-off-by: Gerd Hoffmann --- 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 73479d6..e251e61 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -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; -- 1.7.1