Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3bfffd97ef913045080861d1898286ac8975c22a

Authored by Pavel Machek
Committed by Linus Torvalds
1 parent 9bfd354b1b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 6 changed files with 6 additions and 6 deletions Side-by-side Diff

arch/sh/kernel/cpu/bus.c
Diff comments   View file @ 3bfffd9
... ... @@ -31,7 +31,7 @@
31 31 return shdev->dev_id == shdrv->dev_id;
32 32 }
33 33  
34   -static int sh_bus_suspend(struct device *dev, u32 state)
  34 +static int sh_bus_suspend(struct device *dev, pm_message_t state)
35 35 {
36 36 struct sh_dev *shdev = to_sh_dev(dev);
37 37 struct sh_driver *shdrv = to_sh_driver(dev->driver);
drivers/ide/pci/sc1200.c
Diff comments   View file @ 3bfffd9
... ... @@ -346,7 +346,7 @@
346 346 } sc1200_saved_state_t;
347 347  
348 348  
349   -static int sc1200_suspend (struct pci_dev *dev, u32 state)
  349 +static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
350 350 {
351 351 ide_hwif_t *hwif = NULL;
352 352  
drivers/macintosh/via-pmu.c
Diff comments   View file @ 3bfffd9
... ... @@ -3052,7 +3052,7 @@
3052 3052  
3053 3053 static int pmu_sys_suspended = 0;
3054 3054  
3055   -static int pmu_sys_suspend(struct sys_device *sysdev, u32 state)
  3055 +static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
3056 3056 {
3057 3057 if (state != PM_SUSPEND_DISK || pmu_sys_suspended)
3058 3058 return 0;
include/asm-sh/bus-sh.h
Diff comments   View file @ 3bfffd9
... ... @@ -34,7 +34,7 @@
34 34 unsigned int bus_id;
35 35 int (*probe)(struct sh_dev *);
36 36 int (*remove)(struct sh_dev *);
37   - int (*suspend)(struct sh_dev *, u32);
  37 + int (*suspend)(struct sh_dev *, pm_message_t);
38 38 int (*resume)(struct sh_dev *);
39 39 };
40 40  
include/linux/mmc/host.h
Diff comments   View file @ 3bfffd9
... ... @@ -98,7 +98,7 @@
98 98 #define mmc_priv(x) ((void *)((x) + 1))
99 99 #define mmc_dev(x) ((x)->dev)
100 100  
101   -extern int mmc_suspend_host(struct mmc_host *, u32);
  101 +extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
102 102 extern int mmc_resume_host(struct mmc_host *);
103 103  
104 104 extern void mmc_detect_change(struct mmc_host *);
... ... @@ -3640,7 +3640,7 @@
3640 3640  
3641 3641 static void cs461x_reset(struct cs_card *card);
3642 3642 static void cs461x_proc_stop(struct cs_card *card);
3643   -static int cs46xx_suspend(struct cs_card *card, u32 state)
  3643 +static int cs46xx_suspend(struct cs_card *card, pm_message_t state)
3644 3644 {
3645 3645 unsigned int tmp;
3646 3646 CS_DBGOUT(CS_PM | CS_FUNCTION, 4,