fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi
Subsystems (4)
PATCH 111/198 fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi
From: Pavel Machek <[email protected]>
This fixes u32 vs. pm_message_t in drivers/mmc, drivers/mtd and drivers/scsi.
Signed-off-by Pavel Machek <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
25-akpm/drivers/mmc/mmc.c | 2 +- 25-akpm/drivers/mmc/mmci.c | 2 +- 25-akpm/drivers/mmc/pxamci.c | 2 +- 25-akpm/drivers/mmc/wbsd.c | 2 +- 25-akpm/drivers/mtd/maps/sa1100-flash.c | 2 +- 25-akpm/drivers/scsi/mesh.c | 2 +- 25-akpm/drivers/scsi/nsp32.c | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/mmc/mmc.c renamed from drivers/mmc/mmc.c~fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi +1 -1
@@ -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);
drivers/mmc/mmci.c renamed from drivers/mmc/mmci.c~fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi +1 -1
@@ -603,7 +603,7 @@ static int mmci_remove(struct amba_devic }#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 ;
drivers/mmc/pxamci.c renamed from drivers/mmc/pxamci.c~fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi +1 -1
@@ -558,7 +558,7 @@ static int pxamci_remove(struct device * }#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 ;
drivers/mmc/wbsd.c renamed from drivers/mmc/wbsd.c~fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi +1 -1
@@ -1563,7 +1563,7 @@ static int wbsd_remove(struct device* de*/ #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" );
drivers/mtd/maps/sa1100-flash.c renamed from drivers/mtd/maps/sa1100-flash.c~fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi +1 -1
@@ -403,7 +403,7 @@ static int __exit sa1100_mtd_remove(stru }#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 ;
drivers/scsi/mesh.c renamed from drivers/scsi/mesh.c~fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi +1 -1
@@ -1757,7 +1757,7 @@ static void set_mesh_power(struct mesh_s#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;
drivers/scsi/nsp32.c renamed from drivers/scsi/nsp32.c~fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi +5 -5
@@ -3435,7 +3435,7 @@ static int nsp32_prom_read_bit(nsp32_hw_#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_devpci_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 *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 * }/* 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);
_