From patchwork Sun May 29 06:37:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sameeh Jubran X-Patchwork-Id: 627481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rHVSR0NKbz9t5g for ; Sun, 29 May 2016 16:38:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.b=P1mWBbtk; dkim-atps=neutral Received: from localhost ([::1]:55131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6uMW-000278-Uc for incoming@patchwork.ozlabs.org; Sun, 29 May 2016 02:38:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6uLx-0001X8-Rm for qemu-devel@nongnu.org; Sun, 29 May 2016 02:37:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b6uLt-0003wB-LG for qemu-devel@nongnu.org; Sun, 29 May 2016 02:37:36 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6uLt-0003w7-Dk for qemu-devel@nongnu.org; Sun, 29 May 2016 02:37:33 -0400 Received: by mail-wm0-x244.google.com with SMTP id q62so12450111wmg.3 for ; Sat, 28 May 2016 23:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=7ryHEyChIZS/M0uS1C/d2HZ9LKSop+HIXIEsz+4QghE=; b=P1mWBbtkBfEY+14gTf/cVEHiABw+SGbYfPFRpW83dbBJLi4e/ItHLgkaquXqpRaDwP s1X7bIX41edBRFB5XBf4/7awrpizOf/ynEcoSH90kKQiIRkpsj7pC2/CXI6usk91xAkJ APnLp+r0l6J83HWjQmgNMGYOv370SvNEOMfbkptv734ED5cUvZ3+Ck+SFcQBDuGen7Rp 1iBIEGReSbZIaB60RzbsajeyLIWFFtRMiIfwTep+FeztJ4P4L4qu6HSorIb3l/25/Q6q 3/kfe1S8NBnfOD0a2GkjujXRmYVJm9hhoVbkiISeRqayWvK2EaLlfMjdpiqzyUIa717z w4Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7ryHEyChIZS/M0uS1C/d2HZ9LKSop+HIXIEsz+4QghE=; b=fGoDa1GM7vDG2i7CwnmxT6DaePU3ZCVDyEZ1A2ULgbU2WKkvuOcFz3Mh1WVt0r49YD 3S+reKVVB/72MEm9gCxdl2u1t3MuYOE3zgMrjzTeEgQxb9sJUfZRO+weVZJzrYFmW4pK 2stPl70WIQrQ2Csvwc4on91cQOVHylb2XB9ftKB9EHMiN749CsHxcV/EaoQCep0zvIqL l5QeGSURUKW4ITEYsruLVZAVU3pgcxXA+ZPxsRl8Z7EfVVkQ3M9JNAJBkKn4fAajA7y2 s7uS8JWI55YMdTQp60dLoDpM9xIEaLrq2l4dlTwz6p9Dq2PqyFBeyd6uhz20zoxcvhEN VzlA== X-Gm-Message-State: ALyK8tKZl3eW3rc28pCatr+xYvKZv7+oetM7xJ69XLHYyTgpXwdv1garxXBEU/CzU6yLmw== X-Received: by 10.194.82.41 with SMTP id f9mr24631281wjy.169.1464503852372; Sat, 28 May 2016 23:37:32 -0700 (PDT) Received: from bark.daynix ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id k127sm17001448wmf.21.2016.05.28.23.37.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 May 2016 23:37:31 -0700 (PDT) From: Sameeh Jubran To: , Jason Wang Date: Sun, 29 May 2016 09:37:25 +0300 Message-Id: <1464503845-29545-1-git-send-email-sameeh@daynix.com> X-Mailer: git-send-email 2.5.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH] e1000: Removing unnecessary if statement X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dmitry Fleytman , Yan Vugenfirer Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since mit_delay can never be 0 this if statement is superfluous. Signed-off-by: Sameeh Jubran Reviewed-by: Stefan Weil --- hw/net/e1000.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 8e79b55..eb903a9 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -365,11 +365,9 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val) */ mit_delay = (mit_delay < 500) ? 500 : mit_delay; - if (mit_delay) { - s->mit_timer_on = 1; - timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - mit_delay * 256); - } + s->mit_timer_on = 1; + timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + mit_delay * 256); s->mit_ide = 0; } }