From patchwork Mon Oct 23 11:31:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 10022357 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 CC742601E8 for ; Mon, 23 Oct 2017 11:32:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB49228864 for ; Mon, 23 Oct 2017 11:32:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF61C28868; Mon, 23 Oct 2017 11:32:18 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F74B28864 for ; Mon, 23 Oct 2017 11:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751357AbdJWLcE (ORCPT ); Mon, 23 Oct 2017 07:32:04 -0400 Received: from mga01.intel.com ([192.55.52.88]:45340 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297AbdJWLcE (ORCPT ); Mon, 23 Oct 2017 07:32:04 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Oct 2017 04:32:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,422,1503385200"; d="scan'208";a="165889093" Received: from rasapala-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.254.82]) by fmsmga005.fm.intel.com with ESMTP; 23 Oct 2017 04:32:01 -0700 From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org, Jarkko Sakkinen , Peter Huewe , Marcel Selhorst , Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net (moderated list:TPM DEVICE DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] tpm: remove a misleading error message from tpm_get_timeouts() Date: Mon, 23 Oct 2017 13:31:55 +0200 Message-Id: <20171023113155.12921-1-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.14.1 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP tpm_transmit_cmd() takes care of printing a TPM error whereas the print statement in tpm_get_timeouts() either duplicates its behavior or prints a system error code still saying that it is a TPM error code. Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm-interface.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index ebe0a1d36d8c..d8e2e5bca903 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -664,13 +664,6 @@ int tpm_get_timeouts(struct tpm_chip *chip) sizeof(cap.timeout)); } - if (rc) { - dev_err(&chip->dev, - "A TPM error (%zd) occurred attempting to determine the timeouts\n", - rc); - return rc; - } - timeout_old[0] = jiffies_to_usecs(chip->timeout_a); timeout_old[1] = jiffies_to_usecs(chip->timeout_b); timeout_old[2] = jiffies_to_usecs(chip->timeout_c);