Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753431AbcCWFc1 (ORCPT ); Wed, 23 Mar 2016 01:32:27 -0400 Received: from mga03.intel.com ([134.134.136.65]:39576 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751052AbcCWFcS (ORCPT ); Wed, 23 Mar 2016 01:32:18 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,381,1455004800"; d="scan'208";a="674209161" From: Jarkko Sakkinen To: Peter Huewe Cc: Jarkko Sakkinen , Marcel Selhorst , Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net (moderated list:TPM DEVICE DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] tpm_tis: drop manufacturer_id from struct tpm_vendor_specific Date: Wed, 23 Mar 2016 07:31:56 +0200 Message-Id: <1458711116-15898-1-git-send-email-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.7.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1740 Lines: 57 Dropped manufacturer_id from struct tpm_vendor_specific and redeclared it in the private struct priv_data that tpm_tis uses because the field is only used tpm_tis. Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm.h | 2 -- drivers/char/tpm/tpm_tis.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index cbab4e9..fcd7f1e 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -145,8 +145,6 @@ struct tpm_vendor_specific { void *priv; wait_queue_head_t read_queue; - - u16 manufacturer_id; }; #define TPM_VPRIV(c) ((c)->vendor.priv) diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 7d7a776..068f021 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -94,6 +94,7 @@ struct tpm_info { #define TPM_RID(l) (0x0F04 | ((l) << 12)) struct priv_data { + u16 manufacturer_id; bool irq_tested; wait_queue_head_t int_queue; }; @@ -516,7 +517,9 @@ out: static bool tpm_tis_req_canceled(struct tpm_chip *chip, u8 status) { - switch (chip->vendor.manufacturer_id) { + struct priv_data *priv = chip->vendor.priv; + + switch (priv->manufacturer_id) { case TPM_VID_WINBOND: return ((status == TPM_STS_VALID) || (status == (TPM_STS_VALID | TPM_STS_COMMAND_READY))); @@ -722,7 +725,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, goto out_err; vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0)); - chip->vendor.manufacturer_id = vendor; + priv->manufacturer_id = vendor; dev_info(dev, "%s TPM (device-id 0x%X, rev-id %d)\n", (chip->flags & TPM_CHIP_FLAG_TPM2) ? "2.0" : "1.2", -- 2.7.3