diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 13:09:01 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-10 15:36:57 -0400 |
commit | 035e2ce8eb7412dbcb8522c19676a1dd52f3c024 (patch) | |
tree | 737e8eb65f06d8358a2d9e128b564376a6a26a53 | |
parent | 7650572a8baa79d317ca5d37a7998593ff0767af (diff) |
PM / TPM: Drop unused pm_message_t argument from tpm_pm_suspend()
The tpm_pm_suspend()'s second argument of type pm_message_t is not
used, so remove it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r-- | drivers/char/tpm/tpm.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm.h | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_atmel.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_nsc.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index ad7c7320dd1b..ae43ac55fc1e 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c | |||
@@ -1274,7 +1274,7 @@ static struct tpm_input_header savestate_header = { | |||
1274 | * We are about to suspend. Save the TPM state | 1274 | * We are about to suspend. Save the TPM state |
1275 | * so that it can be restored. | 1275 | * so that it can be restored. |
1276 | */ | 1276 | */ |
1277 | int tpm_pm_suspend(struct device *dev, pm_message_t pm_state) | 1277 | int tpm_pm_suspend(struct device *dev) |
1278 | { | 1278 | { |
1279 | struct tpm_chip *chip = dev_get_drvdata(dev); | 1279 | struct tpm_chip *chip = dev_get_drvdata(dev); |
1280 | struct tpm_cmd_t cmd; | 1280 | struct tpm_cmd_t cmd; |
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index b1c5280ac159..917f727e6740 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h | |||
@@ -299,7 +299,7 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t, | |||
299 | loff_t *); | 299 | loff_t *); |
300 | extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); | 300 | extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); |
301 | extern void tpm_remove_hardware(struct device *); | 301 | extern void tpm_remove_hardware(struct device *); |
302 | extern int tpm_pm_suspend(struct device *, pm_message_t); | 302 | extern int tpm_pm_suspend(struct device *); |
303 | extern int tpm_pm_resume(struct device *); | 303 | extern int tpm_pm_resume(struct device *); |
304 | extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long, | 304 | extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long, |
305 | wait_queue_head_t *); | 305 | wait_queue_head_t *); |
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c index c64a1bc65349..8244d87f86aa 100644 --- a/drivers/char/tpm/tpm_atmel.c +++ b/drivers/char/tpm/tpm_atmel.c | |||
@@ -170,7 +170,7 @@ static void atml_plat_remove(void) | |||
170 | 170 | ||
171 | static int tpm_atml_suspend(struct platform_device *dev, pm_message_t msg) | 171 | static int tpm_atml_suspend(struct platform_device *dev, pm_message_t msg) |
172 | { | 172 | { |
173 | return tpm_pm_suspend(&dev->dev, msg); | 173 | return tpm_pm_suspend(&dev->dev); |
174 | } | 174 | } |
175 | 175 | ||
176 | static int tpm_atml_resume(struct platform_device *dev) | 176 | static int tpm_atml_resume(struct platform_device *dev) |
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c index 4d2464871ada..8e996575bdbe 100644 --- a/drivers/char/tpm/tpm_nsc.c +++ b/drivers/char/tpm/tpm_nsc.c | |||
@@ -276,7 +276,7 @@ static void tpm_nsc_remove(struct device *dev) | |||
276 | 276 | ||
277 | static int tpm_nsc_suspend(struct platform_device *dev, pm_message_t msg) | 277 | static int tpm_nsc_suspend(struct platform_device *dev, pm_message_t msg) |
278 | { | 278 | { |
279 | return tpm_pm_suspend(&dev->dev, msg); | 279 | return tpm_pm_suspend(&dev->dev); |
280 | } | 280 | } |
281 | 281 | ||
282 | static int tpm_nsc_resume(struct platform_device *dev) | 282 | static int tpm_nsc_resume(struct platform_device *dev) |
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index d2a70cae76df..555a643e88cd 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c | |||
@@ -750,7 +750,7 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, | |||
750 | 750 | ||
751 | static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg) | 751 | static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg) |
752 | { | 752 | { |
753 | return tpm_pm_suspend(&dev->dev, msg); | 753 | return tpm_pm_suspend(&dev->dev); |
754 | } | 754 | } |
755 | 755 | ||
756 | static int tpm_tis_pnp_resume(struct pnp_dev *dev) | 756 | static int tpm_tis_pnp_resume(struct pnp_dev *dev) |
@@ -808,7 +808,7 @@ MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe"); | |||
808 | #endif | 808 | #endif |
809 | static int tpm_tis_suspend(struct platform_device *dev, pm_message_t msg) | 809 | static int tpm_tis_suspend(struct platform_device *dev, pm_message_t msg) |
810 | { | 810 | { |
811 | return tpm_pm_suspend(&dev->dev, msg); | 811 | return tpm_pm_suspend(&dev->dev); |
812 | } | 812 | } |
813 | 813 | ||
814 | static int tpm_tis_resume(struct platform_device *dev) | 814 | static int tpm_tis_resume(struct platform_device *dev) |