From patchwork Tue Dec 20 18:11:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5902 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 872CB23E01 for ; Tue, 20 Dec 2011 18:26:34 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6F477A18235 for ; Tue, 20 Dec 2011 18:26:34 +0000 (UTC) Received: by eaac11 with SMTP id c11so3659588eaa.11 for ; Tue, 20 Dec 2011 10:26:34 -0800 (PST) Received: by 10.205.138.136 with SMTP id is8mr1279895bkc.35.1324405594209; Tue, 20 Dec 2011 10:26:34 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs19326bkc; Tue, 20 Dec 2011 10:26:33 -0800 (PST) Received: by 10.216.138.101 with SMTP id z79mr7480888wei.7.1324405592523; Tue, 20 Dec 2011 10:26:32 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id eo10si1512799wbb.35.2011.12.20.10.26.32 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Dec 2011 10:26:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Rd4A4-0008AP-DJ; Tue, 20 Dec 2011 18:11:36 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Andrzej Zaborowski , =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , Riku Voipio Subject: [PATCH 1/6] hw/omap1.c: omap_mpuio_init() need not be public Date: Tue, 20 Dec 2011 18:11:31 +0000 Message-Id: <1324404696-31368-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1324404696-31368-1-git-send-email-peter.maydell@linaro.org> References: <1324404696-31368-1-git-send-email-peter.maydell@linaro.org> omap_mpuio_init() is only used and defined in omap1.c, so make it static. Signed-off-by: Peter Maydell --- hw/omap.h | 4 ---- hw/omap1.c | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/omap.h b/hw/omap.h index 42eb361..5fe33db 100644 --- a/hw/omap.h +++ b/hw/omap.h @@ -672,10 +672,6 @@ void omap_uart_reset(struct omap_uart_s *s); void omap_uart_attach(struct omap_uart_s *s, CharDriverState *chr); struct omap_mpuio_s; -struct omap_mpuio_s *omap_mpuio_init(MemoryRegion *system_memory, - target_phys_addr_t base, - qemu_irq kbd_int, qemu_irq gpio_int, qemu_irq wakeup, - omap_clk clk); qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s); void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler); void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down); diff --git a/hw/omap1.c b/hw/omap1.c index 53cde76..dddac92 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -2066,7 +2066,7 @@ static void omap_mpuio_onoff(void *opaque, int line, int on) omap_mpuio_kbd_update(s); } -struct omap_mpuio_s *omap_mpuio_init(MemoryRegion *memory, +static struct omap_mpuio_s *omap_mpuio_init(MemoryRegion *memory, target_phys_addr_t base, qemu_irq kbd_int, qemu_irq gpio_int, qemu_irq wakeup, omap_clk clk)