tree 99bfe1a70b64beda23eae38d69d2eec33810fdec
parent 7b6993e907241b7b2b4516f50ae104e66bad5f73
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:58 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:58 2005
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
mmc/mmc.c | 2 +-
mmc/mmci.c | 2 +-
mmc/pxamci.c | 2 +-
mmc/wbsd.c | 2 +-
mtd/maps/sa1100-flash.c | 2 +-
scsi/mesh.c | 2 +-
scsi/nsp32.c | 10 +++++-----
7 files changed, 11 insertions(+), 11 deletions(-)
Index: drivers/mmc/mmc.c
===================================================================
--- 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/mmc/mmc.c (mode:100644
sha1:396a769fb62cb3c0bf9cbab17ffc3994ffb75422)
+++ 99bfe1a70b64beda23eae38d69d2eec33810fdec/drivers/mmc/mmc.c (mode:100644
sha1:3e9701b7a63624931d16cbde02650b69ac96d06c)
@@ -884,7 +884,7 @@
* @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);
Index: drivers/mmc/mmci.c
===================================================================
--- 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/mmc/mmci.c (mode:100644
sha1:4aba132a984367dbe2e5043a46e1ce5b7d4f07f4)
+++ 99bfe1a70b64beda23eae38d69d2eec33810fdec/drivers/mmc/mmci.c (mode:100644
sha1:cce14fc68b6c4f9f3fe8e0e9e8034c337787a2e6)
@@ -603,7 +603,7 @@
}
#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;
Index: drivers/mmc/pxamci.c
===================================================================
--- 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/mmc/pxamci.c (mode:100644
sha1:4eb43dc8edbb2dc15434b07c0bef2a9fce297efb)
+++ 99bfe1a70b64beda23eae38d69d2eec33810fdec/drivers/mmc/pxamci.c (mode:100644
sha1:7daf681678f740a44ccdd8556a3bc6482144dec8)
@@ -558,7 +558,7 @@
}
#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;
Index: drivers/mmc/wbsd.c
===================================================================
--- 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/mmc/wbsd.c (mode:100644
sha1:fc9b89e399e34c4d62d7ec2e3e75566df2aa0734)
+++ 99bfe1a70b64beda23eae38d69d2eec33810fdec/drivers/mmc/wbsd.c (mode:100644
sha1:ecc69fd41f79636526c0119d7807b4e61d30cda0)
@@ -1563,7 +1563,7 @@
*/
#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");
Index: drivers/mtd/maps/sa1100-flash.c
===================================================================
--- 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/mtd/maps/sa1100-flash.c
(mode:100644 sha1:cf230ee6700d64c6ccd81a6f815d2eeb3d7be3c4)
+++ 99bfe1a70b64beda23eae38d69d2eec33810fdec/drivers/mtd/maps/sa1100-flash.c
(mode:100644 sha1:2d05c1ed646c14005ad4220b1f4941374155dd46)
@@ -403,7 +403,7 @@
}
#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;
Index: drivers/scsi/mesh.c
===================================================================
--- 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/scsi/mesh.c (mode:100644
sha1:e7adbb0bedcee5ce83666de60048096224eb38d3)
+++ 99bfe1a70b64beda23eae38d69d2eec33810fdec/drivers/scsi/mesh.c (mode:100644
sha1:40f8748903de88ff84e1af62399a44189c6a987d)
@@ -1757,7 +1757,7 @@
#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;
Index: drivers/scsi/nsp32.c
===================================================================
--- 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/scsi/nsp32.c (mode:100644
sha1:ae2c9d843d793c0fa96d9a4ddf6e070efcd120aa)
+++ 99bfe1a70b64beda23eae38d69d2eec33810fdec/drivers/scsi/nsp32.c (mode:100644
sha1:341f6881333cb71ecf3220a6cc28cb35bdb16bf6)
@@ -3435,7 +3435,7 @@
#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 @@
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 @@
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 @@
}
/* 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);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
