leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tpm-chip: utilize new cdev_device_add helper function

Browse Source 
Replace the open coded registration of the cdev and dev with the
new device_add_cdev() helper. The helper replaces a common pattern by
taking the proper reference against the parent device and adding both
the cdev and the device.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Logan Gunthorpe 2017-03-17 12:48:13 -06:00 committed by Greg Kroah-Hartman
parent 111379dccc
commit 8dbbf58251
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/char/tpm/tpm-chip.c
View File

@ -187,7 +187,6 @@ struct tpm_chip *tpm_chip_alloc(struct device *pdev,
cdev_init(&chip->cdev, &tpm_fops); cdev_init(&chip->cdev, &tpm_fops);
chip->cdev.owner = THIS_MODULE; chip->cdev.owner = THIS_MODULE;
chip->cdev.kobj.parent = &chip->dev.kobj;
return chip; return chip;
@ -230,27 +229,16 @@ static int tpm_add_char_device(struct tpm_chip *chip)
{ {
int rc; int rc;
rc = cdev_add(&chip->cdev, chip->dev.devt, 1); rc = cdev_device_add(&chip->cdev, &chip->dev);
if (rc) { if (rc) {
dev_err(&chip->dev, dev_err(&chip->dev,
"unable to cdev_add() %s, major %d, minor %d, err=%d\n", "unable to cdev_device_add() %s, major %d, minor %d, err=%d\n",
dev_name(&chip->dev), MAJOR(chip->dev.devt), dev_name(&chip->dev), MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc); MINOR(chip->dev.devt), rc);
return rc; return rc;
} }
rc = device_add(&chip->dev);
if (rc) {
dev_err(&chip->dev,
"unable to device_register() %s, major %d, minor %d, err=%d\n",
dev_name(&chip->dev), MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc);
cdev_del(&chip->cdev);
return rc;
}
/* Make the chip available. */ /* Make the chip available. */
mutex_lock(&idr_lock); mutex_lock(&idr_lock);
idr_replace(&dev_nums_idr, chip, chip->dev_num); idr_replace(&dev_nums_idr, chip, chip->dev_num);
@ -261,8 +249,7 @@ static int tpm_add_char_device(struct tpm_chip *chip)
static void tpm_del_char_device(struct tpm_chip *chip) static void tpm_del_char_device(struct tpm_chip *chip)
{ {
cdev_del(&chip->cdev); cdev_device_del(&chip->cdev, &chip->dev);
device_del(&chip->dev);
/* Make the chip unavailable. */ /* Make the chip unavailable. */
mutex_lock(&idr_lock); mutex_lock(&idr_lock);