From nobody Tue Nov 18 04:25:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1608071276; cv=none; d=zohomail.com; s=zohoarc; b=VTolOeg0dxxqbU5GJGIS5zXym2opDIz7Uo2Lu/EgJuvrJYFcy1WkveIbYmdN9cI4MnGc1qGNyktEMdunAnfxvDUvZlIN9PVAOahUn7xiTK3xkRNJ8JMvyrXRmvO4PvEC1dYXbba6/7Ng2V26LarhEcRMMamLXC1aueVcNG0PIs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608071276; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kWg1+cYYQc9yalbndq1Q+pROpZyG/S73S5WbiG4BpFk=; b=WhLplRhOlHgwamWVCHJCpAYOK2lYPUg/Pge8AX5v5AlYWV5c4dLjInbn1Oh+t7SLE1fSqx9WG/QYtovBuZLoyArGSJsivzbIyF6MOBSyHFwClhVhyaDiKESoKy49HadjIX0N7KnJ8vIxT+hV42XyQBxiwMO8mIGmK9WzuhH5gus= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608071276568382.0259594368043; Tue, 15 Dec 2020 14:27:56 -0800 (PST) Received: from localhost ([::1]:38030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpCbM-0005Ju-CZ for importer@patchew.org; Tue, 15 Dec 2020 10:51:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpCRy-0003VH-0I for qemu-devel@nongnu.org; Tue, 15 Dec 2020 10:41:18 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpCRw-0004uR-FP for qemu-devel@nongnu.org; Tue, 15 Dec 2020 10:41:17 -0500 Received: by mail-wm1-x344.google.com with SMTP id 190so7044829wmz.0 for ; Tue, 15 Dec 2020 07:41:16 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 34sm38259978wrh.78.2020.12.15.07.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Dec 2020 07:41:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kWg1+cYYQc9yalbndq1Q+pROpZyG/S73S5WbiG4BpFk=; b=RoC4eNBkcMlp/083JbdOkrzB1X+Cli7srDhrDdI2IrObReko+QgSvZp0q4zMYg6tTN qs3+Dsoa36+nuCayYXOMWENy3jvqkrkhziJhDy/6bFjxYnn5neAVFq16BLuhSJ6HOA+Q zyNtA36FrGPTqSVBlnZ1Jtj9LPsi8YD/h1T8YAtQgamtaqCJxSsaUwEcTaSmEmO5o/fv 43OWrWzmicCAIV2FeLNDYsJfHG8x4NV5M9bDsaKwzp+FtFdr14Q9AsXOrxrxAkwZIrJ8 dS/eAyORDJkOKOLRcCPSqdiE8B5iFqDGonicz9tZOfF3QxzALd8AOmSJE77GbNn6Bs8x 2ihw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kWg1+cYYQc9yalbndq1Q+pROpZyG/S73S5WbiG4BpFk=; b=UVxvywk6mkRMQfmcXxNTWxFKWu07TeZIexh1C4sTZKVg7tOhuPScs9SRmN/UyoIFnJ DpdQmdV6XoNNHYq2LqEOb9PwKrhkYn1fokufEpOWqrtAk7AW5uWllWJ3g5tUSGJTFlqU TRBLoIac+LbeJ57qmur2HAytkKZIny7Feb2R180GLNgXX+KNKbwqg4SdmPOBQWUgNOl3 427pOjuuSMh34E5pZZDu1AmrNPDFG9QVX940v1l4J97RJqj+30l4xhn0ZyzXVSkFuX72 GEkSpLbsHvnsaBXVPcPnsqPRik2vqCHPMw+lP8YVW1VEr3AT2NX9vuf84yL37mN6lnT6 2psw== X-Gm-Message-State: AOAM532sRZN3jb+CV0f9qOrtbkyKXxscFybOp43PZsWLyr7V9gcLXqaz DdUhACU4wjKMpFsEAeo88504A9lApvpQzQ== X-Google-Smtp-Source: ABdhPJzY0RrY5AnUkrV7+k9jibXdVtEYU8uX9aIUUu6TWhEX6W0qtUDS+31520gdQ5ltWf3Cw3GWIw== X-Received: by 2002:a1c:df85:: with SMTP id w127mr34275093wmg.166.1608046874858; Tue, 15 Dec 2020 07:41:14 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] target/arm: Remove timer_del()/timer_deinit() before timer_free() Date: Tue, 15 Dec 2020 15:41:07 +0000 Message-Id: <20201215154107.3255-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201215154107.3255-1-peter.maydell@linaro.org> References: <20201215154107.3255-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::344; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x344.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The Arm CPU finalize function uses a sequence of timer_del(), timer_deinit(= ), timer_free() to free the timer. The timer_deinit() step in this was always unnecessary, and now the timer_del() is implied by timer_free(), so we can collapse this down to simply calling timer_free(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index d6188f6566a..b4795a2bf44 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1304,8 +1304,6 @@ static void arm_cpu_finalizefn(Object *obj) } #ifndef CONFIG_USER_ONLY if (cpu->pmu_timer) { - timer_del(cpu->pmu_timer); - timer_deinit(cpu->pmu_timer); timer_free(cpu->pmu_timer); } #endif --=20 2.20.1