From patchwork Tue Mar 26 12:35:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15667 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 1AE2E23DEE for ; Tue, 26 Mar 2013 12:35:14 +0000 (UTC) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by fiordland.canonical.com (Postfix) with ESMTP id B6542A19945 for ; Tue, 26 Mar 2013 12:35:13 +0000 (UTC) Received: by mail-vc0-f181.google.com with SMTP id hv10so5397079vcb.26 for ; Tue, 26 Mar 2013 05:35:13 -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 :x-gm-message-state; bh=5QLwpLCT3rxf07gRLTq2XX4ZzEhzYTLSthaoug9IlCM=; b=AKLUnZDx7H6f4vBAI1oUi62RkwkY8OkuwEv4BogE1DFt8wUmG9oH5Kh5vC/LSih80e NTreLMLmgG52RN2F4x1OJOjpe7wFfPtPPL0CI+hBZwjBKLeeDwLpH8TewuX/g3LTRWoL 6Xp0mOr0bKqBP8c/P9KpPu2rx1B0p/6GbzIbM/LsVr8i353Z2snvS3vSr0Y7s/AHEN6K PsOpa9leppaivPy+EZvZsfG9e1SjcU+iwFAGChHxfzCIQrowb+wG+Db1QK0v/ceyx5R8 peqD0/YpN+R3FYScmy+F5n1FpTr3dKSf49Qyw0C7Y7kn8AgAYThOXcU4p+CpvU/Mmr9E 2fyQ== X-Received: by 10.52.20.239 with SMTP id q15mr16461297vde.73.1364301313213; Tue, 26 Mar 2013 05:35:13 -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 cg12csp69153ved; Tue, 26 Mar 2013 05:35:12 -0700 (PDT) X-Received: by 10.180.185.197 with SMTP id fe5mr2965014wic.3.1364301311626; Tue, 26 Mar 2013 05:35:11 -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 l8si710441wia.73.2013.03.26.05.35.10 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 26 Mar 2013 05:35:11 -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 1UKT5p-0002SH-7E; Tue, 26 Mar 2013 12:35:09 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-trivial@nongnu.org, Blue Swirl Subject: [PATCH] hw/tcx: Remove unused 'addr' field and the property that sets it Date: Tue, 26 Mar 2013 12:35:09 +0000 Message-Id: <1364301309-9414-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQl/BD55P2rVyyTM91mr9vJoFFZ8voH/rMxnlDFvPYuL8g/aHHOqtKUeQlbTWsEEsMAAJnoo Remove the 'addr' field from TCXState (since it is completely unused), also the qdev property which sets it. This seems to be a relic from many years past; devices don't need to know where they are mapped. Signed-off-by: Peter Maydell --- Random minor cleanup, but I'm hoping we might be able to get rid of the 'taddr' properties altogether; there aren't very many of them... hw/sparc/sun4m.c | 1 - hw/tcx.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 2f214da..9ebda02 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -575,7 +575,6 @@ static void tcx_init(hwaddr addr, int vram_size, int width, SysBusDevice *s; dev = qdev_create(NULL, "SUNW,tcx"); - qdev_prop_set_taddr(dev, "addr", addr); qdev_prop_set_uint32(dev, "vram_size", vram_size); qdev_prop_set_uint16(dev, "width", width); qdev_prop_set_uint16(dev, "height", height); diff --git a/hw/tcx.c b/hw/tcx.c index f1edffd..c44068e 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -37,7 +37,6 @@ typedef struct TCXState { SysBusDevice busdev; - hwaddr addr; QemuConsole *con; uint8_t *vram; uint32_t *vram24, *cplane; @@ -707,7 +706,6 @@ write_err: } static Property tcx_properties[] = { - DEFINE_PROP_TADDR("addr", TCXState, addr, -1), DEFINE_PROP_HEX32("vram_size", TCXState, vram_size, -1), DEFINE_PROP_UINT16("width", TCXState, width, -1), DEFINE_PROP_UINT16("height", TCXState, height, -1),