From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941088AbcKXNR4 (ORCPT ); Thu, 24 Nov 2016 08:17:56 -0500 Received: from mga09.intel.com ([134.134.136.24]:44740 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938515AbcKXNRy (ORCPT ); Thu, 24 Nov 2016 08:17:54 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,543,1473145200"; d="scan'208";a="34079309" Date: Thu, 24 Nov 2016 15:17:50 +0200 From: Jarkko Sakkinen To: Tomas Winkler Cc: tpmdd-devel@lists.sourceforge.net, Jason Gunthorpe , linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4 v2] tmp: use pdev for parent device in tpm_chip_alloc Message-ID: <20161124131750.24px2yoavtk4ipk7@intel.com> References: <1479315821-27349-1-git-send-email-tomas.winkler@intel.com> <1479315821-27349-3-git-send-email-tomas.winkler@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1479315821-27349-3-git-send-email-tomas.winkler@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 16, 2016 at 07:03:40PM +0200, Tomas Winkler wrote: > The tpm stack uses pdev name convention for the parent device. > Fix that also in tpm_chip_alloc(). > > Fixes: 3897cd9c8d1d ("tpm: Split out the devm stuff from tpmm_chip_alloc")' > Signed-off-by: Tomas Winkler Reviewed-by: Jarkko Sakkinen You should CC patches by default also to linux-security-module. I don't think for this particular series it is a major concern though. /Jarkko > --- > Resend. > drivers/char/tpm/tpm-chip.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c > index 3f27753d96aa..9e36a7f21a6e 100644 > --- a/drivers/char/tpm/tpm-chip.c > +++ b/drivers/char/tpm/tpm-chip.c > @@ -141,7 +141,7 @@ static void tpm_dev_release(struct device *dev) > * Allocates a new struct tpm_chip instance and assigns a free > * device number for it. Must be paired with put_device(&chip->dev). > */ > -struct tpm_chip *tpm_chip_alloc(struct device *dev, > +struct tpm_chip *tpm_chip_alloc(struct device *pdev, > const struct tpm_class_ops *ops) > { > struct tpm_chip *chip; > @@ -160,7 +160,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, > rc = idr_alloc(&dev_nums_idr, NULL, 0, TPM_NUM_DEVICES, GFP_KERNEL); > mutex_unlock(&idr_lock); > if (rc < 0) { > - dev_err(dev, "No available tpm device numbers\n"); > + dev_err(pdev, "No available tpm device numbers\n"); > kfree(chip); > return ERR_PTR(rc); > } > @@ -170,7 +170,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, > > chip->dev.class = tpm_class; > chip->dev.release = tpm_dev_release; > - chip->dev.parent = dev; > + chip->dev.parent = pdev; > chip->dev.groups = chip->groups; > > if (chip->dev_num == 0) > @@ -182,7 +182,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, > if (rc) > goto out; > > - if (!dev) > + if (!pdev) > chip->flags |= TPM_CHIP_FLAG_VIRTUAL; > > cdev_init(&chip->cdev, &tpm_fops); > -- > 2.7.4 >