[v5,14/21] tpm: tpm-interface.c drop unused macros

Message ID	20180928223035.14471-15-tomas.winkler@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-security-module-owner@kernel.org> From: Tomas Winkler <tomas.winkler@intel.com> To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jason Gunthorpe <jgg@ziepe.ca> Cc: Nayna Jain <nayna@linux.vnet.ibm.com>, Alexander Usyskin <alexander.usyskin@intel.com>, Tadeusz Struk <tadeusz.struk@intel.com>, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler <tomas.winkler@intel.com> Subject: [PATCH v5 14/21] tpm: tpm-interface.c drop unused macros Date: Sat, 29 Sep 2018 01:30:28 +0300 Message-Id: <20180928223035.14471-15-tomas.winkler@intel.com> In-Reply-To: <20180928223035.14471-1-tomas.winkler@intel.com> References: <20180928223035.14471-1-tomas.winkler@intel.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk
Series	tpm: separate tpm 1.x and tpm 2.x commands \| expand [v5,00/21] tpm: separate tpm 1.x and tpm 2.x commands [v5,01/21] tpm2: add new tpm2 commands according to TCG 1.36 [v5,02/21] tpm: sort objects in the Makefile [v5,03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c [v5,04/21] tpm: add tpm_calc_ordinal_duration() wrapper [v5,05/21] tpm: factor out tpm_get_timeouts() [v5,06/21] tpm: move tpm1_pcr_extend to tpm1-cmd.c [v5,07/21] tpm: move tpm_getcap to tpm1-cmd.c [v5,08/21] tpm: factor out tpm1_get_random into tpm1-cmd.c [v5,09/21] tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c [v5,10/21] tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.c [v5,11/21] tpm: factor out tpm_startup function [v5,12/21] tpm: move pcr extend code to tpm2-cmd.c [v5,13/21] tpm: add tpm_auto_startup() into tpm-interface.c [v5,14/21] tpm: tpm-interface.c drop unused macros [v5,15/21] tpm: tpm-space.c remove unneeded semicolon [v5,16/21] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure [v5,17/21] tpm1: implement tpm1_pcr_read_dev() using tpm_buf structure [v5,18/21] tmp1: rename tpm1_pcr_read_dev to tpm1_pcr_read(). [v5,19/21] tpm1: reimplement SAVESTATE using tpm_buf [v5,20/21] tpm1: reimplement tpm1_continue_selftest() using tpm_buf [v5,21/21] tpm: use u32 instead of int for PCR index

Message ID

20180928223035.14471-15-tomas.winkler@intel.com (mailing list archive)

State

New, archived

Headers

From: Tomas Winkler <tomas.winkler@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
        Jason Gunthorpe <jgg@ziepe.ca>
Cc: Nayna Jain <nayna@linux.vnet.ibm.com>,
        Alexander Usyskin <alexander.usyskin@intel.com>,
        Tadeusz Struk <tadeusz.struk@intel.com>,
        linux-integrity@vger.kernel.org,
        linux-security-module@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Tomas Winkler <tomas.winkler@intel.com>
Subject: [PATCH v5 14/21] tpm: tpm-interface.c drop unused macros
Date: Sat, 29 Sep 2018 01:30:28 +0300
Message-Id: <20180928223035.14471-15-tomas.winkler@intel.com>
In-Reply-To: <20180928223035.14471-1-tomas.winkler@intel.com>
References: <20180928223035.14471-1-tomas.winkler@intel.com>
Sender: owner-linux-security-module@vger.kernel.org
Precedence: bulk

Series

tpm: separate tpm 1.x and tpm 2.x commands | expand

Commit Message

Winkler, Tomas Sept. 28, 2018, 10:30 p.m. UTC

The commit:
"tpm_tis: further simplify calculation of ordinal duration"
left unused macros, we can drop them now.

Fixes compilation warnings:
tpm-interface.c:37:0: warning: macro "TPM_PROTECTED_COMMAND" is not used [-Wunused-macros]
tpm-interface.c:36:0: warning: macro "TSC_MAX_ORDINAL" is not used [-Wunused-macros]
tpm-interface.c:38:0: warning: macro "TPM_CONNECTION_COMMAND" is not used [-Wunused-macros]

Fixes: f72864300139 ("tpm_tis: further simplify calculation of ordinal duration")
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---

V3: New in the series.
V4: Fix the commit message.
V5: Resend.

 drivers/char/tpm/tpm-interface.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index fb142e229f95..98f9a0bbeed9 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -33,10 +33,6 @@ 
 
 #include "tpm.h"
 
-#define TSC_MAX_ORDINAL 12
-#define TPM_PROTECTED_COMMAND 0x00
-#define TPM_CONNECTION_COMMAND 0x40
-
 /*
  * Bug workaround - some TPM's don't flush the most
  * recently changed pcr on suspend, so force the flush

[v5,14/21] tpm: tpm-interface.c drop unused macros

Commit Message

Patch