From patchwork Mon Feb 20 09:13:54 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: 655061 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1294883wrc; Mon, 20 Feb 2023 01:25:11 -0800 (PST) X-Google-Smtp-Source: AK7set/WBvBzaRf+X4ZPpRIfXTRJ0Crng9eyAH2PwDR4XWcRVlrfPZgABIc+l7F3C9V6PxgYgF8e X-Received: by 2002:ac8:7d84:0:b0:3b6:30dd:d472 with SMTP id c4-20020ac87d84000000b003b630ddd472mr12443661qtd.44.1676885111658; Mon, 20 Feb 2023 01:25:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676885111; cv=none; d=google.com; s=arc-20160816; b=w1KEp/NkpmMPXIIde4o0iQG1oSH48/9vR8g1+RybUVY38TJJimDFufd8j0zAXaCCpq pCadUlpamWKYNsM2k3FKM6xDmUWLyrdCq3JOM0/xKqmt8HB3sVyCuxG8A+aQZl0MPQTF NIM3E54k1oB5Uv9MNMtctTJ15lwkQ9BfEro5pI93KmS3zcQ5VZsinKWosjAwcd8pPzOf zK2G98Y7RVOZNfr85SIGO2Y7InsTCTcJXXOiWgIFLJPVuFkMSHizAgNKdVAXoTlPcSqt DOWf6nf1AuNT64VFV2cUfIemN2w3xlzOsUTBZeg3lIzh4vHLSoE6D1Bb6vPdPsuCuL16 9geQ== 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=4M2DzovwtGl/lACfMl2//Pyf/dMcjW1q/+QzA0NgGAA=; b=r//GjvG9SZ4Cd1zpoXUWSWUu9OhfYFMb2qScch9w/TxrHBZykjCG/nBOQ8ODqlY4+E /1CPIImmo8gYPd494qlRqsYqsw7PGu2qk7RsRnUhJSLA90Ds7dc4GAjjp1ttVfARyN8k p0jUsCRtUFkbByIqbu1FZh3rsLQ5jgp4LCDA0nglbJ6nI6Vzp+z2M2Aw4oPTMQT/w+Jv 8kP4XGWo8jKaadk/F8JHGc7H3jls3Ox5YwCa0K9ailF7Miu7+mqAm4OoxLTB+ggXiCK6 xmHIp58kNkJTZ9qjIArQXDihuhXzjNa09Z6aKiPBi/iJvrzoghBpveVHL4f/ryMZ8fne kIHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iMKuljpn; 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 o19-20020a05622a139300b003b63c88761esi9955132qtk.700.2023.02.20.01.25.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Feb 2023 01:25:11 -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=iMKuljpn; 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 1pU2IU-0001aS-LZ; Mon, 20 Feb 2023 04:17:23 -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 1pU2Gt-0007AR-Vp for qemu-devel@nongnu.org; Mon, 20 Feb 2023 04:15:44 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pU2Gs-0003t0-6p for qemu-devel@nongnu.org; Mon, 20 Feb 2023 04:15:43 -0500 Received: by mail-wr1-x436.google.com with SMTP id b10so1930649wrx.11 for ; Mon, 20 Feb 2023 01:15:41 -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=4M2DzovwtGl/lACfMl2//Pyf/dMcjW1q/+QzA0NgGAA=; b=iMKuljpnZBJ7a/EDsmZR4NisF1RKjfx4bI6aAVBclwO6/ZEGdJ2XasXkRfdhlE3Tmi TWWM4iXx96COyPQZLyTeMeVj5R35MlqIgPGc3S68NtjLqUrEiCk0/A5af9w+51UWlHwl jO45PJK99CbH5QdiMz3GDKxHXMlyFOg+hzK6rk+O3FOlOR3hLbz3h6SX0oh1aygo8HE7 cLhFpqSypDd8KPG38NXtCtvm5fIJ2eOqcRC8BLltwCHokiaTaqH5cMxPLTtJqWEYXeIN Vf1MRk57fSsr5wxDGKPwJc6/6pjM+TfxrPx05v+P/rg5PoxhQMOG5/73ryeOmze3gXG7 s2Iw== 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=4M2DzovwtGl/lACfMl2//Pyf/dMcjW1q/+QzA0NgGAA=; b=f/xq8+WIaWZQZW4DXFWiXTNgrboJCtThn7kVb1peZTW4a/RpBpk0lxgt8hbWbMHfK8 7SUAtU92pFhsgEEWrvrFXQNH7JTAim0NqSJV8Ny4/XtS0omYARltIVyK8jftckpBQeIf 45KeinHP9V/BflFoMf7b2LjuP7FA4pvCI8gjULwhDm23qBAV+qf6WchFQEnoT+bSYbSt kaK1pzcOXxaPOBCB+yHo3bhRQojV2Irh7idZxJh25iX37aKiW4oMxuhND+iZDYFPOISZ fws9ZrC9WNp/imgd3CUS+S9fcreIyrF90o/jOizwqDxsqFEuSRs4ZKzdjq1HfKJ/0TEY J1XA== X-Gm-Message-State: AO0yUKUIx/MpdnU1TZU4GoQFAVR8BfzvISYX//i+vO8om4xXrFgDvrZ+ vJ3IsonRBC6vTTIcbTu+K7A/fPLZMFBcfXLY X-Received: by 2002:adf:e255:0:b0:2c5:52ef:61c5 with SMTP id bl21-20020adfe255000000b002c552ef61c5mr137090wrb.41.1676884541203; Mon, 20 Feb 2023 01:15:41 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id x17-20020adff651000000b002c563b124basm1028706wrp.103.2023.02.20.01.15.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Feb 2023 01:15:40 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, John Snow , qemu-block@nongnu.org, qemu-arm@nongnu.org, Bernhard Beschow , =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 20/24] hw/ide/pci: Unexport bmdma_active_if() Date: Mon, 20 Feb 2023 10:13:54 +0100 Message-Id: <20230220091358.17038-21-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230220091358.17038-1-philmd@linaro.org> References: <20230220091358.17038-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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=unavailable 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 From: Bernhard Beschow The function is only used inside ide/pci.c, so doesn't need to be exported. Signed-off-by: Bernhard Beschow Signed-off-by: Philippe Mathieu-Daudé --- hw/ide/pci.c | 6 ++++++ include/hw/ide/pci.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 2ddcb49b27..fc9224bbc9 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -104,6 +104,12 @@ const MemoryRegionOps pci_ide_data_le_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; +static IDEState *bmdma_active_if(BMDMAState *bmdma) +{ + assert(bmdma->bus->retry_unit != (uint8_t)-1); + return bmdma->bus->ifs + bmdma->bus->retry_unit; +} + static void bmdma_start_dma(const IDEDMA *dma, IDEState *s, BlockCompletionFunc *dma_cb) { diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index 2a6284acac..7b5e3f6e1c 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -55,12 +55,6 @@ struct PCIIDEState { MemoryRegion data_bar[2]; }; -static inline IDEState *bmdma_active_if(BMDMAState *bmdma) -{ - assert(bmdma->bus->retry_unit != (uint8_t)-1); - return bmdma->bus->ifs + bmdma->bus->retry_unit; -} - void bmdma_init(IDEBus *bus, BMDMAState *bm, PCIIDEState *d); void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val); extern MemoryRegionOps bmdma_addr_ioport_ops;