From: Kylene Jo Hall <kjhall@us.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org
Subject: [PATCH 3 of 6] tpm: change from pci_dev to dev power management functions
Date: Tue, 25 Oct 2005 10:21:55 -0500 [thread overview]
Message-ID: <1130253715.4839.62.camel@localhost.localdomain> (raw)
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
---
diff --exclude='*.o' --exclude='*.ko' --exclude='*.mod*' --exclude='tpm_*' --exclude='.*' --exclude='Makefile*' --exclude='Kconfig*' -uprN linux-2.6.13/drivers/char/tpm/tpm.c linux-2.6.13-tpm/drivers/char/tpm/tpm.c
--- linux-2.6.13/drivers/char/tpm/tpm.c 2005-10-19 14:27:57.000000000 -0500
+++ linux-2.6.13-tpm/drivers/char/tpm/tpm.c 2005-10-18 15:22:55.000000000 -0500
@@ -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, u32 level)
{
- struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+ struct tpm_chip *chip = dev_get_drvdata(dev);
if (chip == NULL)
return -ENODEV;
@@ -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, u32 level)
{
- struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+ struct tpm_chip *chip = dev_get_drvdata(dev);
if (chip == NULL)
return -ENODEV;
diff --exclude='*.o' --exclude='*.ko' --exclude='*.mod*' --exclude='tpm_*' --exclude='.*' --exclude='Makefile*' --exclude='Kconfig*' -uprN linux-2.6.13/drivers/char/tpm/tpm.h linux-2.6.13-tpm/drivers/char/tpm/tpm.h
--- linux-2.6.13/drivers/char/tpm/tpm.h 2005-10-19 14:27:57.000000000 -0500
+++ linux-2.6.13-tpm/drivers/char/tpm/tpm.h 2005-10-18 15:17:32.000000000 -0500
@@ -100,5 +100,5 @@ extern ssize_t tpm_write(struct file *,
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,u32);
+extern int tpm_pm_resume(struct device *, u32);
reply other threads:[~2005-10-25 15:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1130253715.4839.62.camel@localhost.localdomain \
--to=kjhall@us.ibm.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®