ChangeSet 1.2211, 2005/03/30 09:44:51-08:00, [EMAIL PROTECTED]
[PATCH] Fix u32 vs. pm_message_t confusion in MMC
This fixes u32 vs. pm_message_t confusion in MMC layer.
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
drivers/mmc/mmc_block.c | 2 +-
drivers/mmc/mmc_sysfs.c | 2 +-
include/linux/mmc/card.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -Nru a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
--- a/drivers/mmc/mmc_block.c 2005-03-30 12:13:23 -08:00
+++ b/drivers/mmc/mmc_block.c 2005-03-30 12:13:23 -08:00
@@ -437,7 +437,7 @@
}
#ifdef CONFIG_PM
-static int mmc_blk_suspend(struct mmc_card *card, u32 state)
+static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state)
{
struct mmc_blk_data *md = mmc_get_drvdata(card);
diff -Nru a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
--- a/drivers/mmc/mmc_sysfs.c 2005-03-30 12:13:23 -08:00
+++ b/drivers/mmc/mmc_sysfs.c 2005-03-30 12:13:23 -08:00
@@ -109,7 +109,7 @@
return 0;
}
-static int mmc_bus_suspend(struct device *dev, u32 state)
+static int mmc_bus_suspend(struct device *dev, pm_message_t state)
{
struct mmc_driver *drv = to_mmc_driver(dev->driver);
struct mmc_card *card = dev_to_mmc_card(dev);
diff -Nru a/include/linux/mmc/card.h b/include/linux/mmc/card.h
--- a/include/linux/mmc/card.h 2005-03-30 12:13:23 -08:00
+++ b/include/linux/mmc/card.h 2005-03-30 12:13:23 -08:00
@@ -75,7 +75,7 @@
struct device_driver drv;
int (*probe)(struct mmc_card *);
void (*remove)(struct mmc_card *);
- int (*suspend)(struct mmc_card *, u32);
+ int (*suspend)(struct mmc_card *, pm_message_t);
int (*resume)(struct mmc_card *);
};
-
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
