Skip to content

Commit

Permalink
[PATCH] tpm: change from pci_dev to dev power management functions
Browse files Browse the repository at this point in the history
This patch is in support of moving away from the lpc bus pci_dev.  The power
management prototypes used by platform drivers is different but the
functionality remains the same.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Kylene Jo Hall authored and Linus Torvalds committed Oct 31, 2005
1 parent e659a3f commit ce2c87d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions drivers/char/tpm/tpm.c
Original file line number Diff line number Diff line change
Expand Up @@ -484,9 +484,9 @@ static u8 savestate[] = {
* We are about to suspend. Save the TPM state
* so that it can be restored.
*/
int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state)
int tpm_pm_suspend(struct device *dev, pm_message_t pm_state)
{
struct tpm_chip *chip = pci_get_drvdata(pci_dev);
struct tpm_chip *chip = dev_get_drvdata(dev);
if (chip == NULL)
return -ENODEV;

Expand All @@ -500,9 +500,9 @@ EXPORT_SYMBOL_GPL(tpm_pm_suspend);
* Resume from a power safe. The BIOS already restored
* the TPM state.
*/
int tpm_pm_resume(struct pci_dev *pci_dev)
int tpm_pm_resume(struct device *dev)
{
struct tpm_chip *chip = pci_get_drvdata(pci_dev);
struct tpm_chip *chip = dev_get_drvdata(dev);

if (chip == NULL)
return -ENODEV;
Expand Down
4 changes: 2 additions & 2 deletions drivers/char/tpm/tpm.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,5 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t,
loff_t *);
extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
extern void tpm_remove_hardware(struct device *);
extern int tpm_pm_suspend(struct pci_dev *, pm_message_t);
extern int tpm_pm_resume(struct pci_dev *);
extern int tpm_pm_suspend(struct device *, pm_message_t);
extern int tpm_pm_resume(struct device *);

0 comments on commit ce2c87d

Please sign in to comment.