Commit bfaa07bc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-drivers' 

* pm-drivers:
  rtc-cmos: report wakeups from interrupt handler
  PM / crypto / ux500: Use struct dev_pm_ops for power management
  PM / IPMI: Remove empty legacy PCI PM callbacks
  tpm_nsc: Use struct dev_pm_ops for power management
  tpm_tis: Use struct dev_pm_ops for power management
  tpm_atmel: Use struct dev_pm_ops for power management
  PM / TPM: Drop unused pm_message_t argument from tpm_pm_suspend()
  omap-rng: Use struct dev_pm_ops for power management
  mg_disk: Use struct dev_pm_ops for power management
  msi-laptop: Use struct dev_pm_ops for power management
  hdaps: Use struct dev_pm_ops for power management
  sonypi: Use struct dev_pm_ops for power management
  intel_mid_thermal: Use struct dev_pm_ops for power management
  acer-wmi: Use struct dev_pm_ops for power management
  intel_ips: Remove empty legacy PM callbacks
  thinkpad_acpi: Use struct dev_pm_ops instead of legacy PM routines
  thinkpad_acpi: Drop pm_message_t arguments from suspend routines
parents 6148d38b b45bae36

drivers/block/mg_disk.c

+7 −6
Original line number Diff line number Diff line
@@ -780,9 +780,9 @@ static const struct block_device_operations mg_disk_ops = { 
	.getgeo = mg_getgeo

};



static int mg_suspend(struct platform_device *plat_dev, pm_message_t state)

static int mg_suspend(struct device *dev)

{

	struct mg_drv_data *prv_data = plat_dev->dev.platform_data;

	struct mg_drv_data *prv_data = dev->platform_data;

	struct mg_host *host = prv_data->host;



	if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD))
@@ -804,9 +804,9 @@ static int mg_suspend(struct platform_device *plat_dev, pm_message_t state) 
	return 0;

}



static int mg_resume(struct platform_device *plat_dev)

static int mg_resume(struct device *dev)

{

	struct mg_drv_data *prv_data = plat_dev->dev.platform_data;

	struct mg_drv_data *prv_data = dev->platform_data;

	struct mg_host *host = prv_data->host;



	if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD))
@@ -825,6 +825,8 @@ static int mg_resume(struct platform_device *plat_dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(mg_pm, mg_suspend, mg_resume);



static int mg_probe(struct platform_device *plat_dev)

{

	struct mg_host *host;
@@ -1074,11 +1076,10 @@ static int mg_remove(struct platform_device *plat_dev) 
static struct platform_driver mg_disk_driver = {

	.probe = mg_probe,

	.remove = mg_remove,

	.suspend = mg_suspend,

	.resume = mg_resume,

	.driver = {

		.name = MG_DEV_NAME,

		.owner = THIS_MODULE,

		.pm = &mg_pm,

	}

};

drivers/char/hw_random/omap-rng.c

+7 −6
Original line number Diff line number Diff line
@@ -162,22 +162,24 @@ static int __exit omap_rng_remove(struct platform_device *pdev) 


#ifdef CONFIG_PM



static int omap_rng_suspend(struct platform_device *pdev, pm_message_t message)

static int omap_rng_suspend(struct device *dev)

{

	omap_rng_write_reg(RNG_MASK_REG, 0x0);

	return 0;

}



static int omap_rng_resume(struct platform_device *pdev)

static int omap_rng_resume(struct device *dev)

{

	omap_rng_write_reg(RNG_MASK_REG, 0x1);

	return 0;

}



static SIMPLE_DEV_PM_OPS(omap_rng_pm, omap_rng_suspend, omap_rng_resume);

#define	OMAP_RNG_PM	(&omap_rng_pm)



#else



#define	omap_rng_suspend	NULL

#define	omap_rng_resume		NULL

#define	OMAP_RNG_PM	NULL



#endif
@@ -188,11 +190,10 @@ static struct platform_driver omap_rng_driver = { 
	.driver = {

		.name		= "omap_rng",

		.owner		= THIS_MODULE,

		.pm		= OMAP_RNG_PM,

	},

	.probe		= omap_rng_probe,

	.remove		= __exit_p(omap_rng_remove),

	.suspend	= omap_rng_suspend,

	.resume		= omap_rng_resume

};



static int __init omap_rng_init(void)

drivers/char/ipmi/ipmi_si_intf.c

+0 −16
Original line number Diff line number Diff line
@@ -2503,18 +2503,6 @@ static void __devexit ipmi_pci_remove(struct pci_dev *pdev) 
	cleanup_one_si(info);

}



#ifdef CONFIG_PM

static int ipmi_pci_suspend(struct pci_dev *pdev, pm_message_t state)

{

	return 0;

}



static int ipmi_pci_resume(struct pci_dev *pdev)

{

	return 0;

}

#endif



static struct pci_device_id ipmi_pci_devices[] = {

	{ PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) },

	{ PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) },
@@ -2527,10 +2515,6 @@ static struct pci_driver ipmi_pci_driver = { 
	.id_table =     ipmi_pci_devices,

	.probe =        ipmi_pci_probe,

	.remove =       __devexit_p(ipmi_pci_remove),

#ifdef CONFIG_PM

	.suspend =      ipmi_pci_suspend,

	.resume =       ipmi_pci_resume,

#endif

};

#endif /* CONFIG_PCI */

drivers/char/sonypi.c

+7 −6
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ static int __devexit sonypi_remove(struct platform_device *dev) 
#ifdef CONFIG_PM

static int old_camera_power;



static int sonypi_suspend(struct platform_device *dev, pm_message_t state)

static int sonypi_suspend(struct device *dev)

{

	old_camera_power = sonypi_device.camera_power;

	sonypi_disable();
@@ -1467,14 +1467,16 @@ static int sonypi_suspend(struct platform_device *dev, pm_message_t state) 
	return 0;

}



static int sonypi_resume(struct platform_device *dev)

static int sonypi_resume(struct device *dev)

{

	sonypi_enable(old_camera_power);

	return 0;

}



static SIMPLE_DEV_PM_OPS(sonypi_pm, sonypi_suspend, sonypi_resume);

#define SONYPI_PM	(&sonypi_pm)

#else

#define sonypi_suspend	NULL

#define sonypi_resume	NULL

#define SONYPI_PM	NULL

#endif



static void sonypi_shutdown(struct platform_device *dev)
@@ -1486,12 +1488,11 @@ static struct platform_driver sonypi_driver = { 
	.driver		= {

		.name	= "sonypi",

		.owner	= THIS_MODULE,

		.pm	= SONYPI_PM,

	},

	.probe		= sonypi_probe,

	.remove		= __devexit_p(sonypi_remove),

	.shutdown	= sonypi_shutdown,

	.suspend	= sonypi_suspend,

	.resume		= sonypi_resume,

};



static struct platform_device *sonypi_platform_device;

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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE