diff options
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r-- | drivers/char/tpm/tpm.c | 8 | ||||
-rw-r--r-- | drivers/char/tpm/tpm.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index 75f949b53177..e3919c353f3d 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c | |||
@@ -484,9 +484,9 @@ static u8 savestate[] = { | |||
484 | * We are about to suspend. Save the TPM state | 484 | * We are about to suspend. Save the TPM state |
485 | * so that it can be restored. | 485 | * so that it can be restored. |
486 | */ | 486 | */ |
487 | int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state) | 487 | int tpm_pm_suspend(struct device *dev, pm_message_t pm_state) |
488 | { | 488 | { |
489 | struct tpm_chip *chip = pci_get_drvdata(pci_dev); | 489 | struct tpm_chip *chip = dev_get_drvdata(dev); |
490 | if (chip == NULL) | 490 | if (chip == NULL) |
491 | return -ENODEV; | 491 | return -ENODEV; |
492 | 492 | ||
@@ -500,9 +500,9 @@ EXPORT_SYMBOL_GPL(tpm_pm_suspend); | |||
500 | * Resume from a power safe. The BIOS already restored | 500 | * Resume from a power safe. The BIOS already restored |
501 | * the TPM state. | 501 | * the TPM state. |
502 | */ | 502 | */ |
503 | int tpm_pm_resume(struct pci_dev *pci_dev) | 503 | int tpm_pm_resume(struct device *dev) |
504 | { | 504 | { |
505 | struct tpm_chip *chip = pci_get_drvdata(pci_dev); | 505 | struct tpm_chip *chip = dev_get_drvdata(dev); |
506 | 506 | ||
507 | if (chip == NULL) | 507 | if (chip == NULL) |
508 | return -ENODEV; | 508 | return -ENODEV; |
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 27bc8ccb931a..024814b50c3c 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h | |||
@@ -100,5 +100,5 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t, | |||
100 | loff_t *); | 100 | loff_t *); |
101 | extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); | 101 | extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); |
102 | extern void tpm_remove_hardware(struct device *); | 102 | extern void tpm_remove_hardware(struct device *); |
103 | extern int tpm_pm_suspend(struct pci_dev *, pm_message_t); | 103 | extern int tpm_pm_suspend(struct device *, pm_message_t); |
104 | extern int tpm_pm_resume(struct pci_dev *); | 104 | extern int tpm_pm_resume(struct device *); |