From e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:29 -0700 Subject: [PATCH] [PATCH] fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi This fixes u32 vs. pm_message_t in drivers/mmc, drivers/mtd and drivers/scsi. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/mmc/mmc.c | 2 +- drivers/mmc/mmci.c | 2 +- drivers/mmc/pxamci.c | 2 +- drivers/mmc/wbsd.c | 2 +- drivers/mtd/maps/sa1100-flash.c | 2 +- drivers/scsi/mesh.c | 2 +- drivers/scsi/nsp32.c | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index e4002632825..eeb9f6668e6 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -884,7 +884,7 @@ EXPORT_SYMBOL(mmc_free_host); * @host: mmc host * @state: suspend mode (PM_SUSPEND_xxx) */ -int mmc_suspend_host(struct mmc_host *host, u32 state) +int mmc_suspend_host(struct mmc_host *host, pm_message_t state) { mmc_claim_host(host); mmc_deselect_cards(host); diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 3ee961c206b..3a5f6ac5b36 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c @@ -603,7 +603,7 @@ static int mmci_remove(struct amba_device *dev) } #ifdef CONFIG_PM -static int mmci_suspend(struct amba_device *dev, u32 state) +static int mmci_suspend(struct amba_device *dev, pm_message_t state) { struct mmc_host *mmc = amba_get_drvdata(dev); int ret = 0; diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index f76deedf535..b78beb1b015 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c @@ -558,7 +558,7 @@ static int pxamci_remove(struct device *dev) } #ifdef CONFIG_PM -static int pxamci_suspend(struct device *dev, u32 state, u32 level) +static int pxamci_suspend(struct device *dev, pm_message_t state, u32 level) { struct mmc_host *mmc = dev_get_drvdata(dev); int ret = 0; diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 938bca0414e..39747526c71 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -1563,7 +1563,7 @@ static int wbsd_remove(struct device* dev) */ #ifdef CONFIG_PM -static int wbsd_suspend(struct device *dev, u32 state, u32 level) +static int wbsd_suspend(struct device *dev, pm_message_t state, u32 level) { DBGF("Not yet supported\n"); diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 0a6f861c4cd..52385705da0 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) } #ifdef CONFIG_PM -static int sa1100_mtd_suspend(struct device *dev, u32 state, u32 level) +static int sa1100_mtd_suspend(struct device *dev, pm_message_t state, u32 level) { struct sa_info *info = dev_get_drvdata(dev); int ret = 0; diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index 85f3a74ac42..f6da46d672f 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) #ifdef CONFIG_PM -static int mesh_suspend(struct macio_dev *mdev, u32 state) +static int mesh_suspend(struct macio_dev *mdev, pm_message_t state) { struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); unsigned long flags; diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index acfead1e9f1..d28c0d99c34 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) #ifdef CONFIG_PM /* Device suspended */ -static int nsp32_suspend(struct pci_dev *pdev, u32 state) +static int nsp32_suspend(struct pci_dev *pdev, pm_message_t state) { struct Scsi_Host *host = pci_get_drvdata(pdev); @@ -3443,7 +3443,7 @@ static int nsp32_suspend(struct pci_dev *pdev, u32 state) pci_save_state (pdev); pci_disable_device (pdev); - pci_set_power_state(pdev, state); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); return 0; } @@ -3457,8 +3457,8 @@ static int nsp32_resume(struct pci_dev *pdev) nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host); - pci_set_power_state(pdev, 0); - pci_enable_wake (pdev, 0, 0); + pci_set_power_state(pdev, PCI_D0); + pci_enable_wake (pdev, PCI_D0, 0); pci_restore_state (pdev); reg = nsp32_read2(data->BaseAddress, INDEX_REG); @@ -3479,7 +3479,7 @@ static int nsp32_resume(struct pci_dev *pdev) } /* Enable wake event */ -static int nsp32_enable_wake(struct pci_dev *pdev, u32 state, int enable) +static int nsp32_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable) { struct Scsi_Host *host = pci_get_drvdata(pdev); -- 2.41.0