From nobody Tue Nov 26 12:27:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707855160566534.5776129223157; Tue, 13 Feb 2024 12:12:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZz0N-0004E0-5a; Tue, 13 Feb 2024 15:03:47 -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 1rZyyw-0002Ym-Pj for qemu-devel@nongnu.org; Tue, 13 Feb 2024 15:02:21 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZyyv-00023o-AE for qemu-devel@nongnu.org; Tue, 13 Feb 2024 15:02:18 -0500 Received: from [2a00:23c4:8bb2:1300:c500:f104:bc51:e670] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rZygd-0008m4-El; Tue, 13 Feb 2024 19:43:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=EA5YnaUP3gDHF5AaE9uZujarI/GD/Dg9Sof51XT/n9E=; b=HlRioVnoEYONPiOoQoc9nRxgJT 70Fg7A6wb37KXLbD64BYULEbKAsdmhLIKfwJyjHEwpk7K2cmFTb6OtzdU4Oy1vlpm3abvbURR8cDn RwYnKTuZyQo+Q0GsdV3yd4DwW44Zpz2pdVQ1d9/i8yB/sHWPBfYETjJtWwyrU3gLswcNlpp4jyapm OHNIR9Jddujp0R5ak3/QCe3T6AuJQwS13hC4r/UEZj1aX57q+bEd3EzNZBZOojVjuISP43VmV7aIr /yBxWhOzvHWvC/fddrgFPwL2jmkPK+vUu1W13hhKfMbP2sDWBUiXu0asSfPbAPgnDqITTdmo4e4Wf EA+UNpaUPYGExmDnHkRxr68tiSjdX8NC3qjNES87Ymrd0Ua83iYpNy8dG1xxI3PqAsioFLEwfAwKp LHcq7xKYHg5yOyBjbeJbFCR79uqVleew++dhvH3vUhRvZd8Y75CcDUnnVexACR2RyVVisg9+4A5TY F7701FJ/Hm8IzrJWyzpUjUAmZmKtOABs8n0Dk2Tk9hUnATUP1zkLe/AxpJfmfQd/CcLb0/jM7ZujW y7TWHQ8lq5TBG+KHXebNxBZtd5WZMGuwnLO55p+LT2f/ZugeK0N5SO6T+7fZgpdX3L6nrHAeN7fy4 cNZAufW9D+BCnAq3sB9fSioO4GBw0TaTwdeBWbzK4=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Tue, 13 Feb 2024 19:40:19 +0000 Message-Id: <20240213194052.1162753-56-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240213194052.1162753-1-mark.cave-ayland@ilande.co.uk> References: <20240213194052.1162753-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bb2:1300:c500:f104:bc51:e670 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 55/88] esp.c: always use esp_do_dma() in pdma_cb() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1707855162301100005 Content-Type: text/plain; charset="utf-8" There is now only a single implementation contained within esp_do_dma() so call it directly. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-56-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index c6e5ddd537..bdbdb209f7 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -807,13 +807,7 @@ static void esp_do_nodma(ESPState *s) =20 static void esp_pdma_cb(ESPState *s) { - switch (s->pdma_cb) { - case DO_DMA_PDMA_CB: - esp_do_dma(s); - break; - default: - g_assert_not_reached(); - } + esp_do_dma(s); } =20 void esp_command_complete(SCSIRequest *req, size_t resid) --=20 2.39.2