tree 9c136dc028fca2a140e8bbe6afb67b6a1f883635
parent 2a5bcbe439189594dfd9343a50864ea568f46d60
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:53 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:53 2005
[PATCH] pm_message_t: more fixes in common and i386
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately
that turned out not to be the case as Russel King pointed out. Here are
fixes for Documentation and common code (mainly system devices).
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
Documentation/driver-model/bus.txt | 2 +-
Documentation/driver-model/driver.txt | 4 ++--
arch/i386/kernel/apic.c | 2 +-
arch/i386/kernel/i8259.c | 2 +-
arch/i386/kernel/io_apic.c | 2 +-
arch/i386/kernel/nmi.c | 2 +-
arch/i386/kernel/time.c | 2 +-
arch/i386/oprofile/nmi_int.c | 2 +-
drivers/base/sys.c | 3 ++-
include/linux/pci.h | 5 +++--
include/linux/sysdev.h | 5 +++--
11 files changed, 17 insertions(+), 14 deletions(-)
Index: Documentation/driver-model/bus.txt
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/Documentation/driver-model/bus.txt
(mode:100644 sha1:6aed1d8ce5072eadc0a6e423cd2bb32b3d683f20)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/Documentation/driver-model/bus.txt
(mode:100644 sha1:aba806f342273adf72881f8d103e36395e778005)
@@ -18,7 +18,7 @@
int (*match)(struct device * dev, struct device_driver *
drv);
int (*hotplug) (struct device *dev, char **envp,
int num_envp, char *buffer, int
buffer_size);
- int (*suspend)(struct device * dev, u32 state);
+ int (*suspend)(struct device * dev, pm_message_t state);
int (*resume)(struct device * dev);
};
Index: Documentation/driver-model/driver.txt
===================================================================
---
4e8dcdc367984155f9c270251327135c940a3e6a/Documentation/driver-model/driver.txt
(mode:100644 sha1:6cdd1ed74ae4fa561dd4b44fecd9ece8ab2afc0a)
+++
9c136dc028fca2a140e8bbe6afb67b6a1f883635/Documentation/driver-model/driver.txt
(mode:100644 sha1:5ec8ff11162dc1da7041c1d72be63557ca10f418)
@@ -16,7 +16,7 @@
int (*probe) (struct device * dev);
int (*remove) (struct device * dev);
- int (*suspend) (struct device * dev, u32 state, u32 level);
+ int (*suspend) (struct device * dev, pm_message_t state, u32
level);
int (*resume) (struct device * dev, u32 level);
void (*release) (struct device_driver * drv);
@@ -195,7 +195,7 @@
If the device is still present, it should quiesce the device and place
it into a supported low-power state.
- int (*suspend) (struct device * dev, u32 state, u32 level);
+ int (*suspend) (struct device * dev, pm_message_t state, u32
level);
suspend is called to put the device in a low power state. There are
several stages to successfully suspending a device, which is denoted in
Index: arch/i386/kernel/apic.c
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/arch/i386/kernel/apic.c
(mode:100644 sha1:ebfea3d7b4dc5bc64a26bfa3f5700c0cc8422ea7)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/arch/i386/kernel/apic.c
(mode:100644 sha1:1e777ddc4eeed618491c3d5538e9184ff1248cd8)
@@ -548,7 +548,7 @@
unsigned int apic_thmr;
} apic_pm_state;
-static int lapic_suspend(struct sys_device *dev, u32 state)
+static int lapic_suspend(struct sys_device *dev, pm_message_t state)
{
unsigned long flags;
Index: arch/i386/kernel/i8259.c
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/arch/i386/kernel/i8259.c
(mode:100644 sha1:9268b8982738418a813f5472dd9466f6e7c5dd3d)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/arch/i386/kernel/i8259.c
(mode:100644 sha1:b3bd9a53c8a482426fc618aaa36b9862ae65dc2f)
@@ -262,7 +262,7 @@
return 0;
}
-static int i8259A_suspend(struct sys_device *dev, u32 state)
+static int i8259A_suspend(struct sys_device *dev, pm_message_t state)
{
save_ELCR(irq_trigger);
return 0;
Index: arch/i386/kernel/io_apic.c
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/arch/i386/kernel/io_apic.c
(mode:100644 sha1:98b0a0846423b2610f0b2cb8e73610674e4bcce6)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/arch/i386/kernel/io_apic.c
(mode:100644 sha1:0e5c85d0ef5f21ba28292c38814b34cc2e01a62f)
@@ -2299,7 +2299,7 @@
};
static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS];
-static int ioapic_suspend(struct sys_device *dev, u32 state)
+static int ioapic_suspend(struct sys_device *dev, pm_message_t state)
{
struct IO_APIC_route_entry *entry;
struct sysfs_ioapic_data *data;
Index: arch/i386/kernel/nmi.c
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/arch/i386/kernel/nmi.c
(mode:100644 sha1:b46aa7702da25832977d14cd9980fdb285b7ee24)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/arch/i386/kernel/nmi.c
(mode:100644 sha1:14dad7a197943e5aac43786f543c2cb719179c63)
@@ -265,7 +265,7 @@
static int nmi_pm_active; /* nmi_active before suspend */
-static int lapic_nmi_suspend(struct sys_device *dev, u32 state)
+static int lapic_nmi_suspend(struct sys_device *dev, pm_message_t state)
{
nmi_pm_active = nmi_active;
disable_lapic_nmi_watchdog();
Index: arch/i386/kernel/time.c
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/arch/i386/kernel/time.c
(mode:100644 sha1:d071fe9a603f8a61e8af1d1669054c84c0d13fbf)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/arch/i386/kernel/time.c
(mode:100644 sha1:87f9695e33a61e75794d4290ebc9991c409dab53)
@@ -376,7 +376,7 @@
static long clock_cmos_diff, sleep_start;
-static int timer_suspend(struct sys_device *dev, u32 state)
+static int timer_suspend(struct sys_device *dev, pm_message_t state)
{
/*
* Estimate time zone so that set_time can update the clock
Index: arch/i386/oprofile/nmi_int.c
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/arch/i386/oprofile/nmi_int.c
(mode:100644 sha1:b76f41546e40100fcb396277cc40c3f6cd30c5a0)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/arch/i386/oprofile/nmi_int.c
(mode:100644 sha1:cdd5867227e52c312c0cde66cc5dfa8fc5e606a6)
@@ -32,7 +32,7 @@
#ifdef CONFIG_PM
-static int nmi_suspend(struct sys_device *dev, u32 state)
+static int nmi_suspend(struct sys_device *dev, pm_message_t state)
{
if (nmi_enabled == 1)
nmi_stop();
Index: drivers/base/sys.c
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/drivers/base/sys.c (mode:100644
sha1:d782b66e58ea0e5bd16b778f03620a70cbf57099)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/drivers/base/sys.c (mode:100644
sha1:3a01e7bb81ba4f86f85433ff73c99559f992f72f)
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/string.h>
+#include <linux/pm.h>
extern struct subsystem devices_subsys;
@@ -302,7 +303,7 @@
* all synchronization.
*/
-int sysdev_suspend(u32 state)
+int sysdev_suspend(pm_message_t state)
{
struct sysdev_class * cls;
Index: include/linux/pci.h
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/include/linux/pci.h (mode:100644
sha1:ef489d70600719252aeebe810b911b423f4b49b7)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/include/linux/pci.h (mode:100644
sha1:bbc57322a86d8f7165ff2026e3f20c18a9d91f3b)
@@ -501,6 +501,7 @@
#define PCI_D2 ((pci_power_t __force) 2)
#define PCI_D3hot ((pci_power_t __force) 3)
#define PCI_D3cold ((pci_power_t __force) 4)
+#define PCI_POWER_ERROR ((pci_power_t __force) -1)
/*
* The pci_dev structure is used to describe PCI devices.
@@ -669,7 +670,7 @@
void (*remove) (struct pci_dev *dev); /* Device removed (NULL if not
a hot-plug capable driver) */
int (*suspend) (struct pci_dev *dev, pm_message_t state); /*
Device suspended */
int (*resume) (struct pci_dev *dev); /* Device woken
up */
- int (*enable_wake) (struct pci_dev *dev, u32 state, int enable); /*
Enable wake event */
+ int (*enable_wake) (struct pci_dev *dev, pci_power_t state, int
enable); /* Enable wake event */
struct device_driver driver;
struct pci_dynids dynids;
@@ -952,7 +953,7 @@
static inline int pci_save_state(struct pci_dev *dev) { return 0; }
static inline int pci_restore_state(struct pci_dev *dev) { return 0; }
static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
{ return 0; }
-static inline pci_power_t pci_choose_state(struct pci_dev *dev, u32 state) {
return PCI_D0; }
+static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t
state) { return PCI_D0; }
static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int
enable) { return 0; }
#define isa_bridge ((struct pci_dev *)NULL)
Index: include/linux/sysdev.h
===================================================================
--- 4e8dcdc367984155f9c270251327135c940a3e6a/include/linux/sysdev.h
(mode:100644 sha1:6d7b6f4fbb252434d2e59c260535d462a9f449f2)
+++ 9c136dc028fca2a140e8bbe6afb67b6a1f883635/include/linux/sysdev.h
(mode:100644 sha1:2f692931a9382269e96726f2096864022e610be1)
@@ -22,6 +22,7 @@
#define _SYSDEV_H_
#include <linux/kobject.h>
+#include <linux/pm.h>
struct sys_device;
@@ -31,7 +32,7 @@
/* Default operations for these types of devices */
int (*shutdown)(struct sys_device *);
- int (*suspend)(struct sys_device *, u32 state);
+ int (*suspend)(struct sys_device *, pm_message_t state);
int (*resume)(struct sys_device *);
struct kset kset;
};
@@ -50,7 +51,7 @@
int (*add)(struct sys_device *);
int (*remove)(struct sys_device *);
int (*shutdown)(struct sys_device *);
- int (*suspend)(struct sys_device *, u32 state);
+ int (*suspend)(struct sys_device *, pm_message_t state);
int (*resume)(struct sys_device *);
};
-
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
