diff options
author | pavel@cz.rmk.(none) <pavel@cz.rmk.(none)> | 2005-04-03 12:18:11 +0100 |
---|---|---|
committer | Russell King <rmk@flint.arm.linux.org.uk> | 2005-04-03 12:18:11 +0100 |
commit | 78b40ce3a76a8f484818bd98adf7a8030e93bcb6 (patch) | |
tree | 1b21ac76083d7fcaa32ac797b0da08af9badcfbb | |
parent | 30f42668ce9be163611ff2b3c58aa64bb9193729 (diff) | |
download | history-78b40ce3a76a8f484818bd98adf7a8030e93bcb6.tar.gz |
[ARM] Fix u32 vs. pm_message_t in arm
Patch from Pavel Machek
This fixes u32 vs. pm_message_t confusion in arm. I was not able to
even compile it, but it should not cause any problems. Please apply,
-rw-r--r-- | arch/arm/common/sa1111.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/corgi_ssp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2440.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 2 | ||||
-rw-r--r-- | arch/arm/oprofile/common.c | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-integrator/lm.h | 2 | ||||
-rw-r--r-- | include/asm-arm/hardware/amba.h | 2 | ||||
-rw-r--r-- | include/asm-arm/hardware/locomo.h | 2 | ||||
-rw-r--r-- | include/asm-arm/hardware/sa1111.h | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 37a39f229236d8..21fce3414ed1e2 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -800,7 +800,7 @@ struct sa1111_save_data { #ifdef CONFIG_PM -static int sa1111_suspend(struct device *dev, u32 state, u32 level) +static int sa1111_suspend(struct device *dev, pm_message_t state, u32 level) { struct sa1111 *sachip = dev_get_drvdata(dev); struct sa1111_save_data *save; diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 3c62021fc838c3..c232f24f4a6004 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -178,7 +178,7 @@ static ssize_t leds_store(struct sys_device *dev, const char *buf, size_t size) static SYSDEV_ATTR(event, 0200, NULL, leds_store); -static int leds_suspend(struct sys_device *dev, u32 state) +static int leds_suspend(struct sys_device *dev, pm_message_t state) { leds_event(led_stop); return 0; @@ -351,7 +351,7 @@ void timer_tick(struct pt_regs *regs) } #ifdef CONFIG_PM -static int timer_suspend(struct sys_device *dev, u32 state) +static int timer_suspend(struct sys_device *dev, pm_message_t state) { struct sys_timer *timer = container_of(dev, struct sys_timer, dev); diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 219ae5080a3079..91ba9fd79c87c7 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -137,7 +137,7 @@ static void __init ap_init_irq(void) #ifdef CONFIG_PM static unsigned long ic_irq_enable; -static int irq_suspend(struct sys_device *dev, u32 state) +static int irq_suspend(struct sys_device *dev, pm_message_t state) { ic_irq_enable = readl(VA_IC_BASE + IRQ_ENABLE); return 0; diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c index 249581f88f5ecf..20729de2af285d 100644 --- a/arch/arm/mach-integrator/time.c +++ b/arch/arm/mach-integrator/time.c @@ -158,7 +158,7 @@ static int rtc_remove(struct amba_device *dev) static struct timespec rtc_delta; -static int rtc_suspend(struct amba_device *dev, u32 state) +static int rtc_suspend(struct amba_device *dev, pm_message_t state) { struct timespec rtc; diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c index 9e01883025d6aa..8ccffba0018fa5 100644 --- a/arch/arm/mach-pxa/corgi_ssp.c +++ b/arch/arm/mach-pxa/corgi_ssp.c @@ -210,7 +210,7 @@ static int corgi_ssp_remove(struct device *dev) return 0; } -static int corgi_ssp_suspend(struct device *dev, u32 state, u32 level) +static int corgi_ssp_suspend(struct device *dev, pm_message_t state, u32 level) { if (level == SUSPEND_POWER_DOWN) { ssp_flush(&corgi_ssp_dev); diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index 5ecfa583711601..bc229fab86d446 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c @@ -1092,7 +1092,7 @@ EXPORT_SYMBOL(s3c2410_dma_getposition); #ifdef CONFIG_PM -static int s3c2410_dma_suspend(struct sys_device *dev, u32 state) +static int s3c2410_dma_suspend(struct sys_device *dev, pm_message_t state) { s3c2410_dma_chan_t *cp = container_of(dev, s3c2410_dma_chan_t, dev); diff --git a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c index 7799d81494615c..9a8cc5ae225566 100644 --- a/arch/arm/mach-s3c2410/s3c2440.c +++ b/arch/arm/mach-s3c2410/s3c2440.c @@ -159,7 +159,7 @@ struct sleep_save s3c2440_sleep[] = { SAVE_ITEM(S3C2440_GPJUP) }; -static int s3c2440_suspend(struct sys_device *dev, u32 state) +static int s3c2440_suspend(struct sys_device *dev, pm_message_t state) { s3c2410_pm_do_save(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep)); return 0; diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c index 64dd21cfba4311..66a929cb7bc5ba 100644 --- a/arch/arm/mach-sa1100/irq.c +++ b/arch/arm/mach-sa1100/irq.c @@ -218,7 +218,7 @@ static struct sa1100irq_state { unsigned int iccr; } sa1100irq_state; -static int sa1100irq_suspend(struct sys_device *dev, u32 state) +static int sa1100irq_suspend(struct sys_device *dev, pm_message_t state) { struct sa1100irq_state *st = &sa1100irq_state; diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index 6ffa50151a8c31..1405383463ea75 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c @@ -178,7 +178,7 @@ static int neponset_probe(struct device *dev) /* * LDM power management. */ -static int neponset_suspend(struct device *dev, u32 state, u32 level) +static int neponset_suspend(struct device *dev, pm_message_t state, u32 level) { /* * Save state. diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index 615a3ccfea5cbe..e57dde88289813 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c @@ -26,7 +26,7 @@ static void pmu_stop(void); static int pmu_create_files(struct super_block *, struct dentry *); #ifdef CONFIG_PM -static int pmu_suspend(struct sys_device *dev, u32 state) +static int pmu_suspend(struct sys_device *dev, pm_message_t state) { if (pmu_enabled) pmu_stop(); diff --git a/include/asm-arm/arch-integrator/lm.h b/include/asm-arm/arch-integrator/lm.h index d792b112974cda..28186b6f2c0962 100644 --- a/include/asm-arm/arch-integrator/lm.h +++ b/include/asm-arm/arch-integrator/lm.h @@ -10,7 +10,7 @@ struct lm_driver { struct device_driver drv; int (*probe)(struct lm_device *); void (*remove)(struct lm_device *); - int (*suspend)(struct lm_device *, u32); + int (*suspend)(struct lm_device *, pm_message_t); int (*resume)(struct lm_device *); }; diff --git a/include/asm-arm/hardware/amba.h b/include/asm-arm/hardware/amba.h index 0cc74f7f7e0e0e..51e6e54b2aa15a 100644 --- a/include/asm-arm/hardware/amba.h +++ b/include/asm-arm/hardware/amba.h @@ -31,7 +31,7 @@ struct amba_driver { int (*probe)(struct amba_device *, void *); int (*remove)(struct amba_device *); void (*shutdown)(struct amba_device *); - int (*suspend)(struct amba_device *, u32); + int (*suspend)(struct amba_device *, pm_message_t); int (*resume)(struct amba_device *); struct amba_id *id_table; }; diff --git a/include/asm-arm/hardware/locomo.h b/include/asm-arm/hardware/locomo.h index 5f9218c1514296..5f10048ec54e7c 100644 --- a/include/asm-arm/hardware/locomo.h +++ b/include/asm-arm/hardware/locomo.h @@ -181,7 +181,7 @@ struct locomo_driver { unsigned int devid; int (*probe)(struct locomo_dev *); int (*remove)(struct locomo_dev *); - int (*suspend)(struct locomo_dev *, u32); + int (*suspend)(struct locomo_dev *, pm_message_t); int (*resume)(struct locomo_dev *); }; diff --git a/include/asm-arm/hardware/sa1111.h b/include/asm-arm/hardware/sa1111.h index 8fd4f528c38df1..319aea064c367e 100644 --- a/include/asm-arm/hardware/sa1111.h +++ b/include/asm-arm/hardware/sa1111.h @@ -567,7 +567,7 @@ struct sa1111_driver { unsigned int devid; int (*probe)(struct sa1111_dev *); int (*remove)(struct sa1111_dev *); - int (*suspend)(struct sa1111_dev *, u32); + int (*suspend)(struct sa1111_dev *, pm_message_t); int (*resume)(struct sa1111_dev *); }; |