Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753478AbcCWFKt (ORCPT ); Wed, 23 Mar 2016 01:10:49 -0400 Received: from mga09.intel.com ([134.134.136.24]:3395 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752992AbcCWFKh (ORCPT ); Wed, 23 Mar 2016 01:10:37 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,380,1455004800"; d="scan'208";a="674200999" 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_atmel: drop tpm_atmel specific fields from tpm_vendor_specific Date: Wed, 23 Mar 2016 07:10:22 +0200 Message-Id: <1458709822-6677-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: 2598 Lines: 92 Introduced a private struct tpm_atmel_priv that contains the variables have_region and region_size that were previously located in struct tpm_vendor_specific. These fields were only used by tpm_atmel. Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm.h | 3 --- drivers/char/tpm/tpm_atmel.c | 23 +++++++++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 4764545..cbab4e9 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -136,9 +136,6 @@ struct tpm_vendor_specific { int irq; - int region_size; - int have_region; - struct list_head list; int locality; unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */ diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c index a48a878..affc04b 100644 --- a/drivers/char/tpm/tpm_atmel.c +++ b/drivers/char/tpm/tpm_atmel.c @@ -35,6 +35,11 @@ enum tpm_atmel_read_status { ATML_STATUS_READY = 0x08 }; +struct tpm_atmel_priv { + int region_size; + int have_region; +}; + static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count) { u8 status, *hdr = buf; @@ -136,12 +141,13 @@ static struct platform_device *pdev; static void atml_plat_remove(void) { struct tpm_chip *chip = dev_get_drvdata(&pdev->dev); + struct tpm_atmel_priv *priv = chip->vendor.priv; if (chip) { tpm_chip_unregister(chip); - if (chip->vendor.have_region) + if (priv->have_region) atmel_release_region(chip->vendor.base, - chip->vendor.region_size); + priv->region_size); atmel_put_base_addr(chip->vendor.iobase); platform_device_unregister(pdev); } @@ -163,6 +169,7 @@ static int __init init_atmel(void) int have_region, region_size; unsigned long base; struct tpm_chip *chip; + struct tpm_atmel_priv *priv; rc = platform_driver_register(&atml_drv); if (rc) @@ -183,6 +190,15 @@ static int __init init_atmel(void) goto err_rel_reg; } + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) { + rc = -ENOMEM; + goto err_unreg_dev; + } + + priv->have_region = have_region; + priv->region_size = region_size; + chip = tpmm_chip_alloc(&pdev->dev, &tpm_atmel); if (IS_ERR(chip)) { rc = PTR_ERR(chip); @@ -191,8 +207,7 @@ static int __init init_atmel(void) chip->vendor.iobase = iobase; chip->vendor.base = base; - chip->vendor.have_region = have_region; - chip->vendor.region_size = region_size; + chip->vendor.priv = priv; rc = tpm_chip_register(chip); if (rc) -- 2.7.3