Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi

Browse source 
This fixes u32 vs.  pm_message_t in drivers/mmc, drivers/mtd and
drivers/scsi.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pavel Machek 2005-04-16 15:25:29 -07:00 committed by Linus Torvalds
parent 8d189f7298
commit e5378ca8c0
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mmc/mmc.c
View file

@ -884,7 +884,7 @@ EXPORT_SYMBOL(mmc_free_host);
* @host: mmc host * @host: mmc host
* @state: suspend mode (PM_SUSPEND_xxx) * @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_claim_host(host);
mmc_deselect_cards(host); mmc_deselect_cards(host);

2
drivers/mmc/mmci.c
View file

@ -603,7 +603,7 @@ static int mmci_remove(struct amba_device *dev)
} }
#ifdef CONFIG_PM #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); struct mmc_host *mmc = amba_get_drvdata(dev);
int ret = 0; int ret = 0;

2
drivers/mmc/pxamci.c
View file

@ -558,7 +558,7 @@ static int pxamci_remove(struct device *dev)
} }
#ifdef CONFIG_PM #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); struct mmc_host *mmc = dev_get_drvdata(dev);
int ret = 0; int ret = 0;

2
drivers/mmc/wbsd.c
View file

@ -1563,7 +1563,7 @@ static int wbsd_remove(struct device* dev)
*/ */
#ifdef CONFIG_PM #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"); DBGF("Not yet supported\n");

2
drivers/mtd/maps/sa1100-flash.c
View file

@ -403,7 +403,7 @@ static int __exit sa1100_mtd_remove(struct device *dev)
} }
#ifdef CONFIG_PM #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); struct sa_info *info = dev_get_drvdata(dev);
int ret = 0; int ret = 0;

2
drivers/scsi/mesh.c
View file

@ -1757,7 +1757,7 @@ static void set_mesh_power(struct mesh_state *ms, int state)
#ifdef CONFIG_PM #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); struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
unsigned long flags; unsigned long flags;

10
drivers/scsi/nsp32.c
View file

@ -3435,7 +3435,7 @@ static int nsp32_prom_read_bit(nsp32_hw_data *data)
#ifdef CONFIG_PM #ifdef CONFIG_PM
/* Device suspended */ /* 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); 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_save_state (pdev);
pci_disable_device (pdev); pci_disable_device (pdev);
pci_set_power_state(pdev, state); pci_set_power_state(pdev, pci_choose_state(pdev, state));
return 0; 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); 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_set_power_state(pdev, PCI_D0);
pci_enable_wake (pdev, 0, 0); pci_enable_wake (pdev, PCI_D0, 0);
pci_restore_state (pdev); pci_restore_state (pdev);
reg = nsp32_read2(data->BaseAddress, INDEX_REG); reg = nsp32_read2(data->BaseAddress, INDEX_REG);
@ -3479,7 +3479,7 @@ static int nsp32_resume(struct pci_dev *pdev)
} }
/* Enable wake event */ /* 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); struct Scsi_Host *host = pci_get_drvdata(pdev);