From patchwork Fri Feb 3 11:36:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 650029 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp765993pva; Fri, 3 Feb 2023 03:39:39 -0800 (PST) X-Google-Smtp-Source: AK7set8eYKziPQRftjYEHwvwyr/NNuHEv9m7B8oqT7b+P1r70k1AXKmdZmpFRKPj5pIAFvaJ7VnB X-Received: by 2002:ad4:4e26:0:b0:536:85d1:1458 with SMTP id dm6-20020ad44e26000000b0053685d11458mr13870914qvb.19.1675424378850; Fri, 03 Feb 2023 03:39:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675424378; cv=none; d=google.com; s=arc-20160816; b=Gdk4Exb9QjS0hdM4UXFoy/zFLsAB+I467FyQh2uKEVK8/mvATEWAFyMbKk1EhR7RUz I03rTzCeiFevh87OANhOw8rGnIY2bYJC+QhbNL9YjCvgXjEcgUd+Mrz6h9zhEhnnwAu+ K4VpuQzopMD0SK/p1N9Dsw9WZm3l5qsP/mwLxpXJcTDbtsY9Ff9NQiawNCqQ2JSni4pi 914RWakwR9g8NRj0JGVZ+thI6yClnNoWnvoUx2TMOBsNjU0aGIAty3A/3LDxmrPEM2Fj GBcXoX77hccym1j8LapRE4wDUASFQEfYza57GdCxahr0bfgh5E6vI3JE1lAjF9uLMTmq yBRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=A0e0NEin6/qB1UWKlWtZ3V9I0KbRtGgK0QPchGtumd0=; b=NmkcA3BVALJb4QVuWX1JrjBB3uCqagf2xTsHLQSA+PMDznBV2Ixumh1SJzRdd1io+P euiOdZCXhcJKOSPN5EYV6sA+2O17o32Tdvpu2az0oeKKsHf1rOM0ZG7zcaV8LelmUGCa djozKu224xlpQ6K6mNuPmKPaXSXrE2S/eh4x1t2cdE3SKlJs1jk3tj70VW7G92a4nWTT kcqahawyiWUAixoYE0nW7rgu8oex494j42uMAGeQhzC0Y/KzbwEz6G63PvmHe6ZhuKEq U2HXY4VDK1WQYlmzsJm6JBnJtSHhZQ/L5GpNLvt+9PB5ZCAF7zxnXMYCXJNUhqEFGdU9 TSew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DMrWgame; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id oo32-20020a056214452000b00535182acf77si1565452qvb.466.2023.02.03.03.39.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Feb 2023 03:39:38 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DMrWgame; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNuNn-0008F2-TN; Fri, 03 Feb 2023 06:37:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNuNm-0008ED-25 for qemu-devel@nongnu.org; Fri, 03 Feb 2023 06:37:30 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNuNk-0001HC-J6 for qemu-devel@nongnu.org; Fri, 03 Feb 2023 06:37:29 -0500 Received: by mail-wr1-x432.google.com with SMTP id j25so847582wrc.4 for ; Fri, 03 Feb 2023 03:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A0e0NEin6/qB1UWKlWtZ3V9I0KbRtGgK0QPchGtumd0=; b=DMrWgameUQbjcd64+jNpjO/Qc9YTZNVQ3swQhJPAqBtUV/EmghCwdKjgTj5CEKwj4y fRyHuxc7qWci9UnH0yaHbzbtaMWV1iMxTikpF0EmFGbb0bOgHS6VH4pk78Fp7CX+TxzQ HBNXOo8l7OivuOBEfps/QVSKdI5YnJWQcW3r+4El74ckF3cDG35H9R6/iDjvDMS+8QlE jqpxMpgGpr12J1TufqCTxhlPT8jhMH93Sa+mL76OuBCiJ4jqkaQeIcSqA6qd/uvEtbj6 c8v3J4AOIoTuDvneYP78cFFycmOtIj7/ApTV/HoEmxPmRa6zJeR7aMWT/5/JNvjamfoz P53A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A0e0NEin6/qB1UWKlWtZ3V9I0KbRtGgK0QPchGtumd0=; b=1JlPR7o8KLw7spGd13SYTabzds/95e0fosrlgAp/OTBB56JmWXHhTN6z+EGT4GNAP+ j2JMw+yUUHbDtV+pL+Ppm7309ueKk60Zhp+TwBoo6w+0/xnhQgoMqSWJcCoqBO/k4nSj TER0DRT814phw7N7sVh+E1V4aNzzcP+G38EJCuw5g41UWGcHEmeFthg9DwcWLvEER6TB GPdu1pdJQlUyjBjiCFp/KMIoRAUHpdF49pOMK9YqURbrL+fIZ/YJW+BUfsj0Z0RzA8f6 I+/1PJl6ppxqubMWZIlMogK3qbHOXvAsaJHxshXi1/MlBdGNJoE50Pamk2Pu4xowfzzG 3oRQ== X-Gm-Message-State: AO0yUKWrJNkyYEkIATeTSbBSPht3ENTif8LNsQHKeTW+VLCbFTkKMmjU bVNtE9EIbIYVev+NlQsFLdb7g+hDoFmuTKQC X-Received: by 2002:adf:f68f:0:b0:2bf:ae17:bf58 with SMTP id v15-20020adff68f000000b002bfae17bf58mr9143116wrp.37.1675424247207; Fri, 03 Feb 2023 03:37:27 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id s7-20020adfeb07000000b002bff1de8d4bsm1791560wrn.49.2023.02.03.03.37.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 Feb 2023 03:37:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Markus Armbruster , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PATCH 7/9] hw/qdev: Remove DEFINE_PROP_DMAADDR() and 'hw/qdev-dma.h' Date: Fri, 3 Feb 2023 12:36:48 +0100 Message-Id: <20230203113650.78146-8-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230203113650.78146-1-philmd@linaro.org> References: <20230203113650.78146-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org DEFINE_PROP_DMAADDR() is only used once. Since it doesn't add much value, simply remove it, along with the header defining it. Signed-off-by: Philippe Mathieu-Daudé --- hw/usb/hcd-ohci-pci.c | 1 - hw/usb/hcd-ohci.c | 3 +-- include/hw/qdev-dma.h | 16 ---------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 include/hw/qdev-dma.h diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 6b630d35a7..92cc151264 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -25,7 +25,6 @@ #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/sysbus.h" -#include "hw/qdev-dma.h" #include "hw/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 9d68036d23..26c377bf1b 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -33,7 +33,6 @@ #include "hw/usb.h" #include "migration/vmstate.h" #include "hw/sysbus.h" -#include "hw/qdev-dma.h" #include "hw/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" @@ -2008,7 +2007,7 @@ static Property ohci_sysbus_properties[] = { DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus), DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3), DEFINE_PROP_UINT32("firstport", OHCISysBusState, firstport, 0), - DEFINE_PROP_DMAADDR("dma-offset", OHCISysBusState, dma_offset, 0), + DEFINE_PROP_UINT64("dma-offset", OHCISysBusState, dma_offset, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/qdev-dma.h b/include/hw/qdev-dma.h deleted file mode 100644 index b00391aa0c..0000000000 --- a/include/hw/qdev-dma.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Support for dma_addr_t typed properties - * - * Copyright (C) 2012 David Gibson, IBM Corporation. - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#ifndef HW_QDEV_DMA_H -#define HW_QDEV_DMA_H - -#define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ - DEFINE_PROP_UINT64(_n, _s, _f, _d) - -#endif