lkml.org 
[lkml]   [2017]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 006/129] tmp: use pdev for parent device in tpm_chip_alloc
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Winkler, Tomas <tomas.winkler@intel.com>

    commit 2998b02b2fb58f36ccbc318b00513174e9947d8e upstream.

    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 <tomas.winkler@intel.com>
    Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/char/tpm/tpm-chip.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/char/tpm/tpm-chip.c
    +++ b/drivers/char/tpm/tpm-chip.c
    @@ -141,7 +141,7 @@ static void tpm_dev_release(struct devic
    * 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 d
    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 d

    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 d
    if (rc)
    goto out;

    - if (!dev)
    + if (!pdev)
    chip->flags |= TPM_CHIP_FLAG_VIRTUAL;

    cdev_init(&chip->cdev, &tpm_fops);

    \
     
     \ /
      Last update: 2017-05-11 16:17    [W:4.032 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site