Message ID | 20191024162724.31675-31-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 5e3478925dd0640b80d766ed330b7d281d761ceb |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2486982ill; Thu, 24 Oct 2019 10:20:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIl8TMxTyeg1O8Crm82l/gojJN+evUhhonDvW2VY1F4LWJNOqULee/o0t4qlEIamCPsB82 X-Received: by 2002:a05:620a:89d:: with SMTP id b29mr15226786qka.266.1571937603222; Thu, 24 Oct 2019 10:20:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571937603; cv=none; d=google.com; s=arc-20160816; b=dMsPoqorlV3vxTmC/ZqgHGydWTAp4IYaqh87xe59ZsVAx8k1hnMLCyixNdaovuwuH/ MieYthNPVhJZ3ujaZwHrG6VRHg4oFr3vZro1xM0/Jnr7hkDEMWoleTg1meLDYz+C0iDc wxnCQ7b0mLM+NZwHfQhSyvK7mkfhzaW/k7tG9/OhQz5jw7poJ++DFn1dCBRKBgma1CoT cf0x9mkwA4BGcAgJngKRf0n8+5LaoV5DnSjWUsChPk/gcCyGQES8HbcJrACSqLmokUhz pkLJHtBTGsVg8SFHvkIQyPSq73DEYT86QmwXAfkLgkEiceN+XOYI3xb2SKbMxyAOyo0B mXDw== 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=OpXzWlpJhscet03TTtHAiTy/AAuzQKIKHX9oxfpPCRA=; b=wWLahA71FRiVwgfp5r3547hC1KkA4nt9ubdrjsbAn6qGw77nMp6x+YSD10XY/WtbUe O/77P9c14J99xhKJoqSzYK/RM+tak9gmjYeAMgQX4jEq2oZr94K9nphv1ilyf/wYnTEv UczovL4JhVMTt1jEppUNIneuNQzgi+u80DwhqbTgET/Xe9nTVdpEdWhV29FNZXVbgljq dB+vxJTB7uRmOsxpk2aQ+Ixb5giYaYNebaM1Y9VcYhazh1Uhj4pLBGgbDrFEZp642py6 nqpoEO+c6N1fQphdhEfVXZfpnDQuY140/Wbt1e8fWYptpBxFiJwKgpportCAnDR+/bxh 1efw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z40pSTqO; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n16si20516513qkg.368.2019.10.24.10.20.03 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Oct 2019 10:20:03 -0700 (PDT) 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=Z40pSTqO; 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]:48556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1iNgmH-0006Ka-US for patch@linaro.org; Thu, 24 Oct 2019 13:20:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58093) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1iNfy2-0007px-Je for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1iNfy1-0000vC-Ht for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:06 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:36438) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1iNfy1-0000ug-Bs for qemu-devel@nongnu.org; Thu, 24 Oct 2019 12:28:05 -0400 Received: by mail-wr1-x434.google.com with SMTP id w18so26261015wrt.3 for <qemu-devel@nongnu.org>; Thu, 24 Oct 2019 09:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OpXzWlpJhscet03TTtHAiTy/AAuzQKIKHX9oxfpPCRA=; b=Z40pSTqONB80Oqdhm67lCCdlNQ71V4OZzAWYdURlvvQdRJ3d4cQRGYAAbJnUQZNyv/ m0qOqHaXil+e6Ovw7s/rkERoEvJ4E3vOx+7zkKA7y7NbyOXTY2f1HTNOvaCNJ1LjD3TQ UFPmwXk74jfu5KndmJjPqAfzeE4+H14GY+1+nGGJhily+/tOJWYJNjEMyq6CRsGzwOGZ 90Gc75W0Q5Jp4lFXv9GTMyz4TJ7avq6xXqIh8BTmALg8VEBEjfgedhr5RsPzz9djwMAj n+tC6i5kolSakty4vi3dtImeI1x3GUr7iqNN+vOC/bJpjx+tJmsfiTPmDxva8v95T6hK ziMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OpXzWlpJhscet03TTtHAiTy/AAuzQKIKHX9oxfpPCRA=; b=cep53tLO/w6n0dGk0xvjv+mh92O3jtmnI67OwH+L/O/yz9Sd8uKPItYbrJhY4t27WU XCTXeZ3+Dz7c5NYophgOxqGI9brc550GGstoDVYhNQhPV0AciL+BvwldEgsmL/J1qu18 FCNF6Gi/8IExpHtANeXSKSdqy3P7kkU8QlrmiNdaog3cCwLYu8ZJmIUoFnSWYdaYkrLK roNWmmBBQBi/AiHWdPK94wQIzMncTBo1z55hO3B6SfvQL2tTHi1Dhhg2dPx77nM3SE+b ablo0Ytf1oYuXl0U6fKa+AAo3vw+sxN567RE1M99xjcZqDo0oCVyjUaSMXxt4jLPMvE9 etZA== X-Gm-Message-State: APjAAAV/dD3xSAzFQdQV0ZF5dXwW+AHLQzkkRx1LfvudxtASEqa0eNHp fnPe00eUkpdVX5MMzue4jXE4HGIQJHg= X-Received: by 2002:a05:6000:34f:: with SMTP id e15mr5074847wre.232.1571934484111; Thu, 24 Oct 2019 09:28:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r27sm42606124wrc.55.2019.10.24.09.28.02 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:28:02 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 30/51] hw/timer/slavio_timer: Remove useless check for NULL t->timer Date: Thu, 24 Oct 2019 17:27:03 +0100 Message-Id: <20191024162724.31675-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191024162724.31675-1-peter.maydell@linaro.org> References: <20191024162724.31675-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 692d213897d..890dd53f8d8 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -227,13 +227,11 @@ static void slavio_timer_mem_writel(void *opaque, hwaddr addr, // set limit, reset counter qemu_irq_lower(t->irq); t->limit = val & TIMER_MAX_COUNT32; - if (t->timer) { - if (t->limit == 0) { /* free-run */ - ptimer_set_limit(t->timer, - LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); - } else { - ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 1); - } + if (t->limit == 0) { /* free-run */ + ptimer_set_limit(t->timer, + LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); + } else { + ptimer_set_limit(t->timer, LIMIT_TO_PERIODS(t->limit), 1); } } break;