From patchwork Mon Feb 27 14:02:02 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: 657109 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2387646wrb; Mon, 27 Feb 2023 06:41:36 -0800 (PST) X-Google-Smtp-Source: AK7set8kDkra7ZoplE7NPilOdiDem5d59blwvdktP2xUBFar/5NdvGjdhYD3drDY60Qw5s3gpC8u X-Received: by 2002:a05:622a:1483:b0:3b9:bd8d:bb22 with SMTP id t3-20020a05622a148300b003b9bd8dbb22mr16413978qtx.14.1677508896412; Mon, 27 Feb 2023 06:41:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677508896; cv=none; d=google.com; s=arc-20160816; b=UU4Jmh7FUf1mb4jySelTDUWOvLdyVTt2MfPE/resg8IiHz3Q7ZdOzZYfYSrFX5DSJ6 4KctNJVt58s0z+nSMKFKdB6TUPiB3mxXA8aYy6/g8p1p+Py9XJcPuf3IGwSil6D7Vrcc ICdPPoC4MR04/d7L5Nj33PdpMssKTeNMFGVI/OB1BfML5OwO+4f612Q/nVdhhWy9s7c3 yI5PeKyoX5/FbHIZd53Re7n0xzUBwlpjF6YIXm42CWmsWqL9ik3Ph85ok8YP+moDxASZ HMlhjKr7j4sQDfRAZ5YCIlsxYv5Yym6IHlhAE/kv1VGmOlIoAGGU6NfFKQ7Qh4c2griX 01Sg== 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:to:from :dkim-signature; bh=fusPliZxFroR31tM0titpPE2I3vuj4ZeCjqW1pWpihU=; b=hxvO7+ltXC1/7EeWFVlt+8QuSBkQxhvvqHUe2+nlZm8kg7m6EpgaBL49LuqWK7VIcR ovDlh3V0+yuWTAvnvaqhRXoksynywoXf5YodH8z3FRr7kXOH9RF6V3mGLPgPIB9J17Y1 GePoPAjsWKSLgh0ZBSrXkuze0BUEA60kWsotrla4Zuyy1EEXZUbFHhY7dDq4FiZXIhEu TcyQIZeoNznyEbS8r6M6N5l4pHt8F7T2V0wJUqizg2064aksbsPdRUExY9bbYCg/iI2a dQ4YQN0+fmIe0H8bDEiD0Pk63EDBwNnkplkC5CqbUkeLo5PbirB18sPFX74o4AbnaIdZ F72Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VbkeYioH; 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 o8-20020a05622a138800b003ac35eb41aesi6469333qtk.757.2023.02.27.06.41.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2023 06:41:36 -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=VbkeYioH; 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 1pWeFP-00029f-OP; Mon, 27 Feb 2023 09:12:59 -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 1pWeEd-0000RW-E1 for qemu-devel@nongnu.org; Mon, 27 Feb 2023 09:12:12 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWeEI-0001Cr-QV for qemu-devel@nongnu.org; Mon, 27 Feb 2023 09:11:52 -0500 Received: by mail-wm1-x329.google.com with SMTP id j19-20020a05600c191300b003eb3e1eb0caso2621044wmq.1 for ; Mon, 27 Feb 2023 06:11:50 -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:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fusPliZxFroR31tM0titpPE2I3vuj4ZeCjqW1pWpihU=; b=VbkeYioHaKWC9ppe0N3KlVLItL89O7jqZU5XvsrRy5MEAMqM3c5RJhcrqqz9liGJXw U0loIbNBreHKE22SKQW05imGz8fwl9NECH3ThURz/io26GbaVoG0QepMr8wM60OhQ4yE NME2+XKfScC93V1bHTy0k3cIqGXS4BOCHdqAAV+uGTuhdQnyihd3hIxQZ6Px3ms6TXpB WGmliWRYOYL0woQnXRAewm1qT8m/db7sYn3p4h9aytvDsc76ZwFWTJuvBvmWO34viTS4 WemN1EfsOdpd2DXOwcHLvTiXiajaKTJzUuJOj5nuw9PgOx87y/YNHKfvKk0hr9AojXvf dnfQ== 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fusPliZxFroR31tM0titpPE2I3vuj4ZeCjqW1pWpihU=; b=1JHMLAYoWlJPgmMmrzEiKG4hJaDRIjSfwJ3lnDwkQ6vOJqPfEzWCdxqrvXJb0Lpj1y zFteEDr5J9HEhcbpA98edvKNaucGYerwdFMVk+IgAda3Pu99GYM6VwFfNuVrjZFnmjDZ KN3gPQY2ubAL2/e3ZaIeaaMvw5jSqCpzgrZ/lGL0me0U181CqiqH9+mabsBoZUYuCTTU 9a/zvBK7gc0d7F8hJe2VvHcyJM9kyzVHxRCqByrGmEl7hh4paD4U+A9+XxoHpd18BFnp n316zPWc4O7gkbp6bKiH5bn2DT2qlJRo4QQp95+TAui3S9nsSv8qRQE//jB9+aDGXepi vwlw== X-Gm-Message-State: AO0yUKV6si6Ku8A84ud7WO2Sfu3XscHGu1kEPY7pZF5MqWT/jOotIXoo fntSfVM3aIzjHXQ2JBbrh10u3CxotsefHbjr X-Received: by 2002:a05:600c:4d18:b0:3ea:e554:7808 with SMTP id u24-20020a05600c4d1800b003eae5547808mr9946317wmp.19.1677507109187; Mon, 27 Feb 2023 06:11:49 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id d24-20020a1c7318000000b003dc522dd25esm9082325wmb.30.2023.02.27.06.11.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Feb 2023 06:11:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 115/126] hw/ide/pci: Unexport bmdma_active_if() Date: Mon, 27 Feb 2023 15:02:02 +0100 Message-Id: <20230227140213.35084-106-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230227140213.35084-1-philmd@linaro.org> References: <20230227140213.35084-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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 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é Message-Id: <20230215112712.23110-18-philmd@linaro.org> --- 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;