From patchwork Tue Mar 26 10:22:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15659 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 3A20423E64 for ; Tue, 26 Mar 2013 10:22:25 +0000 (UTC) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by fiordland.canonical.com (Postfix) with ESMTP id EAF29A198C3 for ; Tue, 26 Mar 2013 10:22:24 +0000 (UTC) Received: by mail-vb0-f47.google.com with SMTP id e21so4384599vbm.20 for ; Tue, 26 Mar 2013 03:22:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=auogB1RIlP5mp/Dnr5u3FTPmBnxD8pcKQkwuwqj4FO4=; b=BAOp/bs9qDosiMbmJ7D5XfIkDSn2IxLKXItDgKJGqRBY8SBSDddBvXVYi23kytFwOj Lcgx0c1l6Y6/ZnDcDvC5UcH42grzgtrqVNvhHaBmnpmrZXt1ZYpuh7pi8p6YBRNXYc9b bzcBGjF+5X8g7rQdWXk/VBCGdJTtrlrbWFaVGPrIzHZ74N2VtTOaP0s1IT58csLoJERc KS/jRX73QR6hH1hWAn3NCTm7ctYbX6ZP2sBHkcR1EUeTz6RjoY8dL3/Pz+UHLGflvh0B 47qdtcWu/aav+Hp+/QEOlDH+pSBQlG43rwrh3mXl/S/xtPHTe4wt7uk9VASJ84ZOHyHY 83Mw== X-Received: by 10.58.210.200 with SMTP id mw8mr19102542vec.32.1364293344457; Tue, 26 Mar 2013 03:22:24 -0700 (PDT) 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.59.4.204 with SMTP id cg12csp64353ved; Tue, 26 Mar 2013 03:22:24 -0700 (PDT) X-Received: by 10.180.84.8 with SMTP id u8mr2151461wiy.1.1364293339503; Tue, 26 Mar 2013 03:22:19 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id x5si478483wje.188.2013.03.26.03.22.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 26 Mar 2013 03:22:19 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UKR1A-0002HT-Ie; Tue, 26 Mar 2013 10:22:12 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Arnd Bergmann , "Michael S. Tsirkin" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Will Deacon , Paul Brook , Aurelien Jarno Subject: [PATCH v2 11/11] hw/versatile_pci: Drop unnecessary vpb_pci_config_addr() Date: Tue, 26 Mar 2013 10:22:11 +0000 Message-Id: <1364293331-8722-12-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364293331-8722-1-git-send-email-peter.maydell@linaro.org> References: <1364293331-8722-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkSlz+W3mI6BPRnB7joOAED993IUAssIq422XkP1xFcDqTIV8LeVHqSraEmf/WIJlq8dEPZ Drop the vpb_pci_config_addr() function -- it is unnecessary since the size of the memory regions means the hwaddr is always within the 24 bit size. (This function was probably a leftover from when read/write functions were called with absolute addresses rather than relative ones.) Signed-off-by: Peter Maydell --- hw/versatile_pci.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index 1575dd7..20092fe 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -192,11 +192,6 @@ static const MemoryRegionOps pci_vpb_reg_ops = { }, }; -static inline uint32_t vpb_pci_config_addr(hwaddr addr) -{ - return addr & 0xffffff; -} - static void pci_vpb_config_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { @@ -222,7 +217,7 @@ static void pci_vpb_config_write(void *opaque, hwaddr addr, } } } - pci_data_write(&s->pci_bus, vpb_pci_config_addr(addr), val, size); + pci_data_write(&s->pci_bus, addr, val, size); } static uint64_t pci_vpb_config_read(void *opaque, hwaddr addr, @@ -230,7 +225,7 @@ static uint64_t pci_vpb_config_read(void *opaque, hwaddr addr, { PCIVPBState *s = (PCIVPBState *)opaque; uint32_t val; - val = pci_data_read(&s->pci_bus, vpb_pci_config_addr(addr), size); + val = pci_data_read(&s->pci_bus, addr, size); return val; }