tree 27dd779f05409b4f7ee91569ad009224729ccbb2
parent 8d189f729829369edb2e797e9a6ebc2b01b359d0
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:29 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:29 -0700
[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
===================================================================
--- a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/mmc/mmc.c (mode:100644
sha1:e40026328251f49a4981f6444adee9e5adb39fda)
+++ 27dd779f05409b4f7ee91569ad009224729ccbb2/drivers/mmc/mmc.c (mode:100644
sha1:eeb9f6668e69167044b3b41bf6559479f30dd5ab)
@@ -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
===================================================================
--- a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/mmc/mmci.c (mode:100644
sha1:3ee961c206bd8dfb5bd209287c4fb9203e73e122)
+++ 27dd779f05409b4f7ee91569ad009224729ccbb2/drivers/mmc/mmci.c (mode:100644
sha1:3a5f6ac5b3641f4635e0a1e418920b923bc8b14c)
@@ -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
===================================================================
--- a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/mmc/pxamci.c (mode:100644
sha1:f76deedf535536f736eb8899964a602ecc89deef)
+++ 27dd779f05409b4f7ee91569ad009224729ccbb2/drivers/mmc/pxamci.c (mode:100644
sha1:b78beb1b0159cc66748c15c19e05407c8c12d076)
@@ -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
===================================================================
--- a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/mmc/wbsd.c (mode:100644
sha1:938bca0414e5fd1f8d9518037cfaa769c5e96829)
+++ 27dd779f05409b4f7ee91569ad009224729ccbb2/drivers/mmc/wbsd.c (mode:100644
sha1:39747526c719ff1f93241e08206e7fd61884b673)
@@ -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
===================================================================
--- a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/mtd/maps/sa1100-flash.c
(mode:100644 sha1:0a6f861c4cd6b71259e89c8493bad0c892db1bb6)
+++ 27dd779f05409b4f7ee91569ad009224729ccbb2/drivers/mtd/maps/sa1100-flash.c
(mode:100644 sha1:52385705da09fe32d13590c7628aa2372e303e65)
@@ -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
===================================================================
--- a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/scsi/mesh.c (mode:100644
sha1:85f3a74ac421850990c806978442aa0d29d72eb0)
+++ 27dd779f05409b4f7ee91569ad009224729ccbb2/drivers/scsi/mesh.c (mode:100644
sha1:f6da46d672f18f063d4a64179b74105445e60e18)
@@ -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
===================================================================
--- a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/scsi/nsp32.c (mode:100644
sha1:acfead1e9f170dd81a144221c8da47ab69f0e61e)
+++ 27dd779f05409b4f7ee91569ad009224729ccbb2/drivers/scsi/nsp32.c (mode:100644
sha1:d28c0d99c3442c79808887672c1f78d26b7bfa94)
@@ -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
