From patchwork Thu Aug 13 10:44:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 52354 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 268B422EC6 for ; Thu, 13 Aug 2015 10:46:20 +0000 (UTC) Received: by lbsm2 with SMTP id m2sf14869416lbs.1 for ; Thu, 13 Aug 2015 03:46:18 -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=gXXut/q0GvCW8E9h6X+hgeGZ4X0LFCk8yxxCfOt7n2E=; b=Tpy8PjuYpp56st5RWEaLDkesmEbe/utADMvPMPdnFSK6Aw3/e+1n6EUiggpv+ok9R9 pUonpF0tOZGS1yYWdzFU/av/vw59DkHui74TpXpJoB267Wkdh1LSjjgpcO0P8QNxJ5RC YL+ji9HrgEwajpGDBEMc3fYJRlg7VJy9yCKiIuuKkiHmW18KyENi6YHeZzKStkEScW9y TBrYM8Opy2x/YnmYI36vPPrwkoLstE9LCoGvKyFqa59NsVxFc0XUuzmBHe1eZD243npa ATvl+zleXUz0auhzd7AmX9ubuG2O4pvbuM158eHWuPOi2rHM/Nx3vhEWVXw0w2zngkyJ zb4w== X-Gm-Message-State: ALoCoQkxB5qVenX2caZjHri1MjNVB7DG2xUN8YMOGCS1cO3QJ9o18eBAswEIhfcGZ3ODcNVnqfHu X-Received: by 10.152.9.99 with SMTP id y3mr10979524laa.10.1439462778320; Thu, 13 Aug 2015 03:46:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.33 with SMTP id ll1ls145711lac.98.gmail; Thu, 13 Aug 2015 03:46:18 -0700 (PDT) X-Received: by 10.112.65.35 with SMTP id u3mr35602488lbs.103.1439462778160; Thu, 13 Aug 2015 03:46:18 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id gf10si1784810lbc.82.2015.08.13.03.46.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Aug 2015 03:46:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbbpu9 with SMTP id pu9so24706936lbb.3 for ; Thu, 13 Aug 2015 03:46:18 -0700 (PDT) X-Received: by 10.112.168.168 with SMTP id zx8mr22631257lbb.117.1439462778079; Thu, 13 Aug 2015 03:46:18 -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 l6csp857956lba; Thu, 13 Aug 2015 03:46:16 -0700 (PDT) X-Received: by 10.107.5.21 with SMTP id 21mr35715140iof.161.1439462774735; Thu, 13 Aug 2015 03:46:14 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id lq3si1197881igb.3.2015.08.13.03.46.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Aug 2015 03:46:14 -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]:41635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq1V-0006dg-Ko for patch@linaro.org; Thu, 13 Aug 2015 06:46:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq0K-0005QP-Q8 for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:45:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPq0I-0005IO-Gy for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:45:00 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPq0I-0005DT-A8 for qemu-devel@nongnu.org; Thu, 13 Aug 2015 06:44:58 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZPq08-00071Y-5Q 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:38 +0100 Message-Id: <1439462687-26903-19-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 18/27] i.MX: Fix Coding style for GPT 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.176 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: cc7d1589e774e87c346b75a6c25e07957f436ced.1437080501.git.jcd@tribudubois.net Signed-off-by: Peter Maydell --- hw/timer/imx_gpt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index f61d4e5..01f802e 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -70,7 +70,7 @@ static char const *imx_gpt_reg_name(uint32_t reg) #endif static const VMStateDescription vmstate_imx_timer_gpt = { - .name = "imx.gpt", + .name = TYPE_IMX_GPT, .version_id = 3, .minimum_version_id = 3, .fields = (VMStateField[]) { @@ -107,7 +107,7 @@ static void imx_gpt_set_freq(IMXGPTState *s) { uint32_t clksrc = extract32(s->cr, GPT_CR_CLKSRC_SHIFT, 3); uint32_t freq = imx_clock_frequency(s->ccm, imx_gpt_clocks[clksrc]) - / (1 + s->pr); + / (1 + s->pr); s->freq = freq; DPRINTF("Setting clksrc %d to frequency %d\n", clksrc, freq); @@ -134,7 +134,7 @@ static uint32_t imx_gpt_update_count(IMXGPTState *s) } static inline uint32_t imx_gpt_find_limit(uint32_t count, uint32_t reg, - uint32_t timeout) + uint32_t timeout) { if ((count < reg) && (timeout > reg)) { timeout = reg;