Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
char
/
tpm
/
tpm-chip.c
diff --git
a/kernel/drivers/char/tpm/tpm-chip.c
b/kernel/drivers/char/tpm/tpm-chip.c
index
45cc39a
..
2521425
100644
(file)
--- a/
kernel/drivers/char/tpm/tpm-chip.c
+++ b/
kernel/drivers/char/tpm/tpm-chip.c
@@
-136,11
+136,13
@@
struct tpm_chip *tpmm_chip_alloc(struct device *dev,
chip->cdev.owner = chip->pdev->driver->owner;
chip->cdev.kobj.parent = &chip->dev.kobj;
chip->cdev.owner = chip->pdev->driver->owner;
chip->cdev.kobj.parent = &chip->dev.kobj;
+ devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev);
+
return chip;
}
EXPORT_SYMBOL_GPL(tpmm_chip_alloc);
return chip;
}
EXPORT_SYMBOL_GPL(tpmm_chip_alloc);
-static int tpm_
dev_add
_device(struct tpm_chip *chip)
+static int tpm_
add_char
_device(struct tpm_chip *chip)
{
int rc;
{
int rc;
@@
-151,7
+153,6
@@
static int tpm_dev_add_device(struct tpm_chip *chip)
chip->devname, MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc);
chip->devname, MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc);
- device_unregister(&chip->dev);
return rc;
}
return rc;
}
@@
-162,16
+163,17
@@
static int tpm_dev_add_device(struct tpm_chip *chip)
chip->devname, MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc);
chip->devname, MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc);
+ cdev_del(&chip->cdev);
return rc;
}
return rc;
}
return rc;
}
return rc;
}
-static void tpm_de
v_del
_device(struct tpm_chip *chip)
+static void tpm_de
l_char
_device(struct tpm_chip *chip)
{
cdev_del(&chip->cdev);
{
cdev_del(&chip->cdev);
- device_
unregister
(&chip->dev);
+ device_
del
(&chip->dev);
}
static int tpm1_chip_register(struct tpm_chip *chip)
}
static int tpm1_chip_register(struct tpm_chip *chip)
@@
-222,7
+224,7
@@
int tpm_chip_register(struct tpm_chip *chip)
tpm_add_ppi(chip);
tpm_add_ppi(chip);
- rc = tpm_
dev_add
_device(chip);
+ rc = tpm_
add_char
_device(chip);
if (rc)
goto out_err;
if (rc)
goto out_err;
@@
-274,6
+276,6
@@
void tpm_chip_unregister(struct tpm_chip *chip)
sysfs_remove_link(&chip->pdev->kobj, "ppi");
tpm1_chip_unregister(chip);
sysfs_remove_link(&chip->pdev->kobj, "ppi");
tpm1_chip_unregister(chip);
- tpm_de
v_del
_device(chip);
+ tpm_de
l_char
_device(chip);
}
EXPORT_SYMBOL_GPL(tpm_chip_unregister);
}
EXPORT_SYMBOL_GPL(tpm_chip_unregister);