Commit 035e2ce8 authored Jul 06, 2012 by Rafael J. Wysocki

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>

parent 7650572a

drivers/char/tpm/tpm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1274,7 +1274,7 @@ static struct tpm_input_header savestate_header = {
		* We are about to suspend. Save the TPM state
		* so that it can be restored.
		*/
		int tpm_pm_suspend(struct device *dev, pm_message_t pm_state)
		int tpm_pm_suspend(struct device *dev)
		{
		struct tpm_chip *chip = dev_get_drvdata(dev);
		struct tpm_cmd_t cmd;

drivers/char/tpm/tpm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,7 @@ 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 device *, pm_message_t);
		extern int tpm_pm_suspend(struct device *);
		extern int tpm_pm_resume(struct device *);
		extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long,
		wait_queue_head_t *);

drivers/char/tpm/tpm_atmel.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ static void atml_plat_remove(void)

		static int tpm_atml_suspend(struct platform_device *dev, pm_message_t msg)
		{
		return tpm_pm_suspend(&dev->dev, msg);
		return tpm_pm_suspend(&dev->dev);
		}

		static int tpm_atml_resume(struct platform_device *dev)

drivers/char/tpm/tpm_nsc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ static void tpm_nsc_remove(struct device *dev)

		static int tpm_nsc_suspend(struct platform_device *dev, pm_message_t msg)
		{
		return tpm_pm_suspend(&dev->dev, msg);
		return tpm_pm_suspend(&dev->dev);
		}

		static int tpm_nsc_resume(struct platform_device *dev)

drivers/char/tpm/tpm_tis.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -750,7 +750,7 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,

		static int tpm_tis_pnp_suspend(struct pnp_dev *dev, pm_message_t msg)
		{
		return tpm_pm_suspend(&dev->dev, msg);
		return tpm_pm_suspend(&dev->dev);
		}

		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");
		#endif
		static int tpm_tis_suspend(struct platform_device *dev, pm_message_t msg)
		{
		return tpm_pm_suspend(&dev->dev, msg);
		return tpm_pm_suspend(&dev->dev);
		}

		static int tpm_tis_resume(struct platform_device *dev)