aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/mmc.c2
-rw-r--r--drivers/mmc/mmci.c2
-rw-r--r--drivers/mmc/pxamci.c2
-rw-r--r--drivers/mmc/wbsd.c2
-rw-r--r--drivers/mtd/maps/sa1100-flash.c2
-rw-r--r--drivers/scsi/mesh.c2
-rw-r--r--drivers/scsi/nsp32.c10
7 files changed, 11 insertions, 11 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index e40026328251..eeb9f6668e69 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -884,7 +884,7 @@ EXPORT_SYMBOL(mmc_free_host);
884 * @host: mmc host 884 * @host: mmc host
885 * @state: suspend mode (PM_SUSPEND_xxx) 885 * @state: suspend mode (PM_SUSPEND_xxx)
886 */ 886 */
887int mmc_suspend_host(struct mmc_host *host, u32 state) 887int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
888{ 888{
889 mmc_claim_host(host); 889 mmc_claim_host(host);
890 mmc_deselect_cards(host); 890 mmc_deselect_cards(host);
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 3ee961c206bd..3a5f6ac5b364 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -603,7 +603,7 @@ static int mmci_remove(struct amba_device *dev)
603} 603}
604 604
605#ifdef CONFIG_PM 605#ifdef CONFIG_PM
606static int mmci_suspend(struct amba_device *dev, u32 state) 606static int mmci_suspend(struct amba_device *dev, pm_message_t state)
607{ 607{
608 struct mmc_host *mmc = amba_get_drvdata(dev); 608 struct mmc_host *mmc = amba_get_drvdata(dev);
609 int ret = 0; 609 int ret = 0;
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index f76deedf5355..b78beb1b0159 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -558,7 +558,7 @@ static int pxamci_remove(struct device *dev)
558} 558}
559 559
560#ifdef CONFIG_PM 560#ifdef CONFIG_PM
561static int pxamci_suspend(struct device *dev, u32 state, u32 level) 561static int pxamci_suspend(struct device *dev, pm_message_t state, u32 level)
562{ 562{
563 struct mmc_host *mmc = dev_get_drvdata(dev); 563 struct mmc_host *mmc = dev_get_drvdata(dev);
564 int ret = 0; 564 int ret = 0;
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 938bca0414e5..39747526c719 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -1563,7 +1563,7 @@ static int wbsd_remove(struct device* dev)
1563 */ 1563 */
1564 1564
1565#ifdef CONFIG_PM 1565#ifdef CONFIG_PM
1566static int wbsd_suspend(struct device *dev, u32 state, u32 level) 1566static int wbsd_suspend(struct device *dev, pm_message_t state, u32 level)
1567{ 1567{
1568 DBGF("Not yet supported\n"); 1568 DBGF("Not yet supported\n");
1569 1569
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 0a6f861c4cd6..52385705da09 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -403,7 +403,7 @@ static int __exit sa1100_mtd_remove(struct device *dev)
403} 403}
404 404
405#ifdef CONFIG_PM 405#ifdef CONFIG_PM
406static int sa1100_mtd_suspend(struct device *dev, u32 state, u32 level) 406static int sa1100_mtd_suspend(struct device *dev, pm_message_t state, u32 level)
407{ 407{
408 struct sa_info *info = dev_get_drvdata(dev); 408 struct sa_info *info = dev_get_drvdata(dev);
409 int ret = 0; 409 int ret = 0;
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 85f3a74ac421..f6da46d672f1 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1757,7 +1757,7 @@ static void set_mesh_power(struct mesh_state *ms, int state)
1757 1757
1758 1758
1759#ifdef CONFIG_PM 1759#ifdef CONFIG_PM
1760static int mesh_suspend(struct macio_dev *mdev, u32 state) 1760static int mesh_suspend(struct macio_dev *mdev, pm_message_t state)
1761{ 1761{
1762 struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); 1762 struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
1763 unsigned long flags; 1763 unsigned long flags;
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index acfead1e9f17..d28c0d99c344 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -3435,7 +3435,7 @@ static int nsp32_prom_read_bit(nsp32_hw_data *data)
3435#ifdef CONFIG_PM 3435#ifdef CONFIG_PM
3436 3436
3437/* Device suspended */ 3437/* Device suspended */
3438static int nsp32_suspend(struct pci_dev *pdev, u32 state) 3438static int nsp32_suspend(struct pci_dev *pdev, pm_message_t state)
3439{ 3439{
3440 struct Scsi_Host *host = pci_get_drvdata(pdev); 3440 struct Scsi_Host *host = pci_get_drvdata(pdev);
3441 3441
@@ -3443,7 +3443,7 @@ static int nsp32_suspend(struct pci_dev *pdev, u32 state)
3443 3443
3444 pci_save_state (pdev); 3444 pci_save_state (pdev);
3445 pci_disable_device (pdev); 3445 pci_disable_device (pdev);
3446 pci_set_power_state(pdev, state); 3446 pci_set_power_state(pdev, pci_choose_state(pdev, state));
3447 3447
3448 return 0; 3448 return 0;
3449} 3449}
@@ -3457,8 +3457,8 @@ static int nsp32_resume(struct pci_dev *pdev)
3457 3457
3458 nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host); 3458 nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host);
3459 3459
3460 pci_set_power_state(pdev, 0); 3460 pci_set_power_state(pdev, PCI_D0);
3461 pci_enable_wake (pdev, 0, 0); 3461 pci_enable_wake (pdev, PCI_D0, 0);
3462 pci_restore_state (pdev); 3462 pci_restore_state (pdev);
3463 3463
3464 reg = nsp32_read2(data->BaseAddress, INDEX_REG); 3464 reg = nsp32_read2(data->BaseAddress, INDEX_REG);
@@ -3479,7 +3479,7 @@ static int nsp32_resume(struct pci_dev *pdev)
3479} 3479}
3480 3480
3481/* Enable wake event */ 3481/* Enable wake event */
3482static int nsp32_enable_wake(struct pci_dev *pdev, u32 state, int enable) 3482static int nsp32_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable)
3483{ 3483{
3484 struct Scsi_Host *host = pci_get_drvdata(pdev); 3484 struct Scsi_Host *host = pci_get_drvdata(pdev);
3485 3485