From 3bfffd97ef913045080861d1898286ac8975c22a Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:37 -0700 Subject: [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/ide/pci/sc1200.c | 2 +- drivers/macintosh/via-pmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 84fda21e4dbd..3bc3bf1be49b 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c @@ -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; diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index cea1e758eb46..aefc0c1a862c 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -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; -- cgit v1.2.3