lkml.org 
[lkml]   [2005]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectFix u32 vs. pm_message_t confusion in MMC
Hi!

This fixes u32 vs. pm_message_t confusion in MMC layer. Please apply,

Pavel

--- clean-mm/drivers/mmc/mmc_block.c 2005-02-15 00:34:38.000000000 +0100
+++ linux-mm/drivers/mmc/mmc_block.c 2005-02-15 01:04:10.000000000 +0100
@@ -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);

--- clean-mm/drivers/mmc/mmc_sysfs.c 2004-10-01 00:30:15.000000000 +0200
+++ linux-mm/drivers/mmc/mmc_sysfs.c 2005-02-15 01:04:10.000000000 +0100
@@ -74,7 +74,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);
--- clean-mm/include/linux/mmc/card.h 2004-10-01 00:30:30.000000000 +0200
+++ linux-mm/include/linux/mmc/card.h 2005-02-15 01:04:11.000000000 +0100
@@ -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 *);
};


--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:10    [W:0.465 / U:0.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site