ChangeSet 1.2224.7.3, 2005/04/03 10:18:11+01:00, [EMAIL PROTECTED](none)
[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,
arch/arm/common/sa1111.c | 2 +-
arch/arm/kernel/time.c | 4 ++--
arch/arm/mach-integrator/integrator_ap.c | 2 +-
arch/arm/mach-integrator/time.c | 2 +-
arch/arm/mach-pxa/corgi_ssp.c | 2 +-
arch/arm/mach-s3c2410/dma.c | 2 +-
arch/arm/mach-s3c2410/s3c2440.c | 2 +-
arch/arm/mach-sa1100/irq.c | 2 +-
arch/arm/mach-sa1100/neponset.c | 2 +-
arch/arm/oprofile/common.c | 2 +-
include/asm-arm/arch-integrator/lm.h | 2 +-
include/asm-arm/hardware/amba.h | 2 +-
include/asm-arm/hardware/locomo.h | 2 +-
include/asm-arm/hardware/sa1111.h | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
diff -Nru a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
--- a/arch/arm/common/sa1111.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/common/sa1111.c 2005-04-03 21:25:35 -07:00
@@ -800,7 +800,7 @@
#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 -Nru a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
--- a/arch/arm/kernel/time.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/kernel/time.c 2005-04-03 21:25:35 -07:00
@@ -178,7 +178,7 @@
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 @@
}
#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 -Nru a/arch/arm/mach-integrator/integrator_ap.c
b/arch/arm/mach-integrator/integrator_ap.c
--- a/arch/arm/mach-integrator/integrator_ap.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/mach-integrator/integrator_ap.c 2005-04-03 21:25:35 -07:00
@@ -137,7 +137,7 @@
#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 -Nru a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c
--- a/arch/arm/mach-integrator/time.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/mach-integrator/time.c 2005-04-03 21:25:35 -07:00
@@ -158,7 +158,7 @@
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 -Nru a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c
--- a/arch/arm/mach-pxa/corgi_ssp.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/mach-pxa/corgi_ssp.c 2005-04-03 21:25:35 -07:00
@@ -210,7 +210,7 @@
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 -Nru a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
--- a/arch/arm/mach-s3c2410/dma.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/mach-s3c2410/dma.c 2005-04-03 21:25:35 -07:00
@@ -1092,7 +1092,7 @@
#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 -Nru a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c
--- a/arch/arm/mach-s3c2410/s3c2440.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/mach-s3c2410/s3c2440.c 2005-04-03 21:25:35 -07:00
@@ -159,7 +159,7 @@
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 -Nru a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
--- a/arch/arm/mach-sa1100/irq.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/mach-sa1100/irq.c 2005-04-03 21:25:35 -07:00
@@ -218,7 +218,7 @@
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 -Nru a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
--- a/arch/arm/mach-sa1100/neponset.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/mach-sa1100/neponset.c 2005-04-03 21:25:35 -07:00
@@ -178,7 +178,7 @@
/*
* 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 -Nru a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
--- a/arch/arm/oprofile/common.c 2005-04-03 21:25:35 -07:00
+++ b/arch/arm/oprofile/common.c 2005-04-03 21:25:35 -07:00
@@ -26,7 +26,7 @@
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 -Nru a/include/asm-arm/arch-integrator/lm.h
b/include/asm-arm/arch-integrator/lm.h
--- a/include/asm-arm/arch-integrator/lm.h 2005-04-03 21:25:35 -07:00
+++ b/include/asm-arm/arch-integrator/lm.h 2005-04-03 21:25:35 -07:00
@@ -10,7 +10,7 @@
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 -Nru a/include/asm-arm/hardware/amba.h b/include/asm-arm/hardware/amba.h
--- a/include/asm-arm/hardware/amba.h 2005-04-03 21:25:35 -07:00
+++ b/include/asm-arm/hardware/amba.h 2005-04-03 21:25:35 -07:00
@@ -31,7 +31,7 @@
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 -Nru a/include/asm-arm/hardware/locomo.h
b/include/asm-arm/hardware/locomo.h
--- a/include/asm-arm/hardware/locomo.h 2005-04-03 21:25:35 -07:00
+++ b/include/asm-arm/hardware/locomo.h 2005-04-03 21:25:35 -07:00
@@ -181,7 +181,7 @@
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 -Nru a/include/asm-arm/hardware/sa1111.h
b/include/asm-arm/hardware/sa1111.h
--- a/include/asm-arm/hardware/sa1111.h 2005-04-03 21:25:35 -07:00
+++ b/include/asm-arm/hardware/sa1111.h 2005-04-03 21:25:35 -07:00
@@ -567,7 +567,7 @@
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 *);
};
-
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
