From patchwork Fri Jul 15 00:29:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Pronin X-Patchwork-Id: 9230899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CE56A6075D for ; Fri, 15 Jul 2016 00:29:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C032626220 for ; Fri, 15 Jul 2016 00:29:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4E3328325; Fri, 15 Jul 2016 00:29:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4B41B26220 for ; Fri, 15 Jul 2016 00:29:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bNr0o-00042Y-Nh; Fri, 15 Jul 2016 00:29:50 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bNr0n-00042G-9v for tpmdd-devel@lists.sourceforge.net; Fri, 15 Jul 2016 00:29:49 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of chromium.org designates 209.85.192.174 as permitted sender) client-ip=209.85.192.174; envelope-from=apronin@chromium.org; helo=mail-pf0-f174.google.com; Received: from mail-pf0-f174.google.com ([209.85.192.174]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES128-SHA:128) (Exim 4.76) id 1bNr0m-000331-Hp for tpmdd-devel@lists.sourceforge.net; Fri, 15 Jul 2016 00:29:49 +0000 Received: by mail-pf0-f174.google.com with SMTP id c2so35254948pfa.2 for ; Thu, 14 Jul 2016 17:29:48 -0700 (PDT) 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=0334/p2iG5Lu6Iz0wr33jItd/DqZYANJc15HxOfutu0=; b=Rac9AWAq9HBViTOCwO0H7G+1WIVai+39d2c4qKCQW/2XbpsivHrE5neGiPQqTtut90 IfYS08Z5OH5o2UCfbYJZLTwQTkKQGr1zPOHU1DykMaYd5NDgjjqORNqnF8mWmZQH6Aik +DeZT7v1q8Y9Ge+/iqE2Yz9fJPIQGoHpyqyXM4R4gCaS2rcTUy53AX9JvM8tw5+pI5p7 7AMAsVjhHVlR8KG1Q5DVmbrhHoaKAZk0h8fnAEX2SFNHn472YOskhAy+7PTD58duqMG+ +2FwGNIPAocAGgLI2iejUM4YnBEQICvPBsIqX23mh+wPl3xKUA7L1TMvihBzE5KCHrEV 2SXg== X-Gm-Message-State: ALyK8tL6HH3+vUWOqiZr4JRVAIBmqmnrDuitBSzGsPSMsQq0+qbSJcU0abaf6tuE0k0g54HQ X-Received: by 10.98.70.199 with SMTP id o68mr17083412pfi.17.1468542582897; Thu, 14 Jul 2016 17:29:42 -0700 (PDT) Received: from apronin0.mtv.corp.google.com ([172.22.64.136]) by smtp.gmail.com with ESMTPSA id e187sm7626521pfg.43.2016.07.14.17.29.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jul 2016 17:29:42 -0700 (PDT) From: Andrey Pronin To: Jarkko Sakkinen Date: Thu, 14 Jul 2016 17:29:40 -0700 Message-Id: <1468542580-5296-1-git-send-email-apronin@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-Headers-End: 1bNr0m-000331-Hp Cc: dianders@chromium.org, linux-kernel@vger.kernel.org, smbarber@chromium.org, tpmdd-devel@lists.sourceforge.net, groeck@chromium.org Subject: [tpmdd-devel] [PATCH] tpm_tis_core: convert max timeouts from msec to jiffies X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net X-Virus-Scanned: ClamAV using ClamSMTP tpm_tis_core was missing conversion from msec when assigning max timeouts from constants. Signed-off-by: Andrey Pronin Reviewed-by: Jason Gunthorpe Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 8110b52..fb8c3de 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -666,10 +666,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, #endif /* Maximum timeouts */ - chip->timeout_a = TIS_TIMEOUT_A_MAX; - chip->timeout_b = TIS_TIMEOUT_B_MAX; - chip->timeout_c = TIS_TIMEOUT_C_MAX; - chip->timeout_d = TIS_TIMEOUT_D_MAX; + chip->timeout_a = msecs_to_jiffies(TIS_TIMEOUT_A_MAX); + chip->timeout_b = msecs_to_jiffies(TIS_TIMEOUT_B_MAX); + chip->timeout_c = msecs_to_jiffies(TIS_TIMEOUT_C_MAX); + chip->timeout_d = msecs_to_jiffies(TIS_TIMEOUT_D_MAX); priv->phy_ops = phy_ops; dev_set_drvdata(&chip->dev, priv);