From patchwork Thu Aug 13 10:44:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 52355 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id 82BA722EC6 for ; Thu, 13 Aug 2015 10:46:22 +0000 (UTC) Received: by labia3 with SMTP id ia3sf15493503lab.1 for ; Thu, 13 Aug 2015 03:46:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=xpx/S87e+aaN//rbwz/KrKKZ7TVmLNVNPDeiLRZfVzM=; b=MwIgYF3oevYxs6ef7TRTCFaAujtYAPMCpA6alxNcQthzXMRc72rLmwnIxGtrUJTjRN wbAWOh/EzUYi2+RA5XgXoND+7SEETX/R5hu0yRSsA3IlYOlJ+qrWa2RuN2gn9iggFey7 yxEie6vjcIAaZ2nYeJ9jM+vgBwv3+s7bLaAPwY3xg4y1lJ4SUSsBbI7pw1efZRi915dA gBCrp0m+jXnUj2mi47RY2ArtvbPcpicTtOq8Bz///HIGSQP2d9kXpZYL/aak4hbevyFS GprxSTbzf2bzWdkrttRZq83enumV2rOXfSSWtQeP7iCoEFIyFvVinkzJLftEIAZpi3X2 6n3g== X-Gm-Message-State: ALoCoQn/uk6tzTQjTGMWguDVw0/AQ+zFM+Ext4aVn9a23PK5Qqivy0+IrtV68xxlqsSTWq4DEv4e X-Received: by 10.152.6.103 with SMTP id z7mr10969845laz.8.1439462781487; Thu, 13 Aug 2015 03:46:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.207.8 with SMTP id ls8ls179464lac.71.gmail; Thu, 13 Aug 2015 03:46:21 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr36701743lbc.32.1439462781364; Thu, 13 Aug 2015 03:46:21 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id j9si1806420lam.16.2015.08.13.03.46.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Aug 2015 03:46:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbcbn3 with SMTP id bn3so24542302lbc.2 for ; Thu, 13 Aug 2015 03:46:21 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr36701727lbc.32.1439462780949; Thu, 13 Aug 2015 03:46:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp857976lba; Thu, 13 Aug 2015 03:46:19 -0700 (PDT) X-Received: by 10.50.30.197 with SMTP id u5mr29890248igh.9.1439462777109; Thu, 13 Aug 2015 03:46:17 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p3si1192213ioe.59.2015.08.13.03.46.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Aug 2015 03:46:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:41636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq1Y-0006j9-29 for patch@linaro.org; Thu, 13 Aug 2015 06:46:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq0M-0005Qe-0k for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:45:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPq0J-0005J4-6m for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:45:01 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq0J-0005DT-00 for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:44:59 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZPq08-00071Q-38 for qemu-devel@nongnu.org; Thu, 13 Aug 2015 11:44:48 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2015 11:44:36 +0100 Message-Id: <1439462687-26903-17-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1439462687-26903-1-git-send-email-peter.maydell@linaro.org> References: <1439462687-26903-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 16/27] i.MX: Fix Coding style for EPIT emulator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Jean-Christophe Dubois Signed-off-by: Jean-Christophe Dubois Reviewed-by: Peter Crosthwaite Message-id: d8d70683c6a48ac318c1635595619cfb0eb31681.1437080501.git.jcd@tribudubois.net Signed-off-by: Peter Maydell --- hw/timer/imx_epit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index f1f82e9..10c5d2b 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -128,9 +128,9 @@ static void imx_epit_reset(DeviceState *dev) static uint32_t imx_epit_update_count(IMXEPITState *s) { - s->cnt = ptimer_get_count(s->timer_reload); + s->cnt = ptimer_get_count(s->timer_reload); - return s->cnt; + return s->cnt; } static uint64_t imx_epit_read(void *opaque, hwaddr offset, unsigned size) @@ -298,13 +298,13 @@ void imx_timerp_create(const hwaddr addr, qemu_irq irq, DeviceState *ccm) } static const MemoryRegionOps imx_epit_ops = { - .read = imx_epit_read, - .write = imx_epit_write, - .endianness = DEVICE_NATIVE_ENDIAN, + .read = imx_epit_read, + .write = imx_epit_write, + .endianness = DEVICE_NATIVE_ENDIAN, }; static const VMStateDescription vmstate_imx_timer_epit = { - .name = "imx.epit", + .name = TYPE_IMX_EPIT, .version_id = 2, .minimum_version_id = 2, .fields = (VMStateField[]) {