Commit 3bfffd97 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] fix u32 vs. pm_message_t in rest of the tree

This fixes u32 vs.  pm_message_t confusion in remaining places.  Fortunately
there's few of them.
Signed-off-by: 's avatarPavel Machek <pavel@suse.cz>
Signed-off-by: 's avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: 's avatarLinus Torvalds <torvalds@osdl.org>
parent 9bfd354b
......@@ -31,7 +31,7 @@ static int sh_bus_match(struct device *dev, struct device_driver *drv)
return shdev->dev_id == shdrv->dev_id;
}
static int sh_bus_suspend(struct device *dev, u32 state)
static int sh_bus_suspend(struct device *dev, pm_message_t state)
{
struct sh_dev *shdev = to_sh_dev(dev);
struct sh_driver *shdrv = to_sh_driver(dev->driver);
......
......@@ -346,7 +346,7 @@ typedef struct sc1200_saved_state_s {
} sc1200_saved_state_t;
static int sc1200_suspend (struct pci_dev *dev, u32 state)
static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
{
ide_hwif_t *hwif = NULL;
......
......@@ -3052,7 +3052,7 @@ pmu_polled_request(struct adb_request *req)
static int pmu_sys_suspended = 0;
static int pmu_sys_suspend(struct sys_device *sysdev, u32 state)
static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
{
if (state != PM_SUSPEND_DISK || pmu_sys_suspended)
return 0;
......
......@@ -34,7 +34,7 @@ struct sh_driver {
unsigned int bus_id;
int (*probe)(struct sh_dev *);
int (*remove)(struct sh_dev *);
int (*suspend)(struct sh_dev *, u32);
int (*suspend)(struct sh_dev *, pm_message_t);
int (*resume)(struct sh_dev *);
};
......
......@@ -98,7 +98,7 @@ extern void mmc_free_host(struct mmc_host *);
#define mmc_priv(x) ((void *)((x) + 1))
#define mmc_dev(x) ((x)->dev)
extern int mmc_suspend_host(struct mmc_host *, u32);
extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
extern int mmc_resume_host(struct mmc_host *);
extern void mmc_detect_change(struct mmc_host *);
......
......@@ -3640,7 +3640,7 @@ static int cs46xx_restart_part(struct cs_card *card)
static void cs461x_reset(struct cs_card *card);
static void cs461x_proc_stop(struct cs_card *card);
static int cs46xx_suspend(struct cs_card *card, u32 state)
static int cs46xx_suspend(struct cs_card *card, pm_message_t state)
{
unsigned int tmp;
CS_DBGOUT(CS_PM | CS_FUNCTION, 4,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment