microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[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 <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pavel Machek 2005-04-16 15:25:24 -07:00 коммит произвёл Linus Torvalds
Родитель 74ad74c158
Коммит 438510f6f0
11 изменённых файлов: 17 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Documentation/driver-model/bus.txt
Просмотреть файл

@ -18,7 +18,7 @@ struct bus_type {
int (*match)(struct device * dev, struct device_driver * drv); int (*match)(struct device * dev, struct device_driver * drv);
int (*hotplug) (struct device *dev, char **envp, int (*hotplug) (struct device *dev, char **envp,
int num_envp, char *buffer, int buffer_size); 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); int (*resume)(struct device * dev);
}; };

4
Documentation/driver-model/driver.txt
Просмотреть файл

@ -16,7 +16,7 @@ struct device_driver {
int (*probe) (struct device * dev); int (*probe) (struct device * dev);
int (*remove) (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); int (*resume) (struct device * dev, u32 level);
void (*release) (struct device_driver * drv); void (*release) (struct device_driver * drv);
@ -195,7 +195,7 @@ device; i.e. anything in the device's driver_data field.
If the device is still present, it should quiesce the device and place If the device is still present, it should quiesce the device and place
it into a supported low-power state. 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 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 several stages to successfully suspending a device, which is denoted in

2
arch/i386/kernel/apic.c
Просмотреть файл

@ -548,7 +548,7 @@ static struct {
unsigned int apic_thmr; unsigned int apic_thmr;
} apic_pm_state; } 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; unsigned long flags;

2
arch/i386/kernel/i8259.c
Просмотреть файл

@ -262,7 +262,7 @@ static int i8259A_resume(struct sys_device *dev)
return 0; 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); save_ELCR(irq_trigger);
return 0; return 0;

2
arch/i386/kernel/io_apic.c
Просмотреть файл

@ -2299,7 +2299,7 @@ struct sysfs_ioapic_data {
}; };
static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS]; 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 IO_APIC_route_entry *entry;
struct sysfs_ioapic_data *data; struct sysfs_ioapic_data *data;

2
arch/i386/kernel/nmi.c
Просмотреть файл

@ -265,7 +265,7 @@ void enable_timer_nmi_watchdog(void)
static int nmi_pm_active; /* nmi_active before suspend */ 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; nmi_pm_active = nmi_active;
disable_lapic_nmi_watchdog(); disable_lapic_nmi_watchdog();

2
arch/i386/kernel/time.c
Просмотреть файл

@ -376,7 +376,7 @@ void notify_arch_cmos_timer(void)
static long clock_cmos_diff, sleep_start; 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 * Estimate time zone so that set_time can update the clock

2
arch/i386/oprofile/nmi_int.c
Просмотреть файл

@ -32,7 +32,7 @@ static int nmi_enabled = 0;
#ifdef CONFIG_PM #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) if (nmi_enabled == 1)
nmi_stop(); nmi_stop();

3
drivers/base/sys.c
Просмотреть файл

@ -20,6 +20,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/pm.h>
extern struct subsystem devices_subsys; extern struct subsystem devices_subsys;
@ -302,7 +303,7 @@ void sysdev_shutdown(void)
* all synchronization. * all synchronization.
*/ */
int sysdev_suspend(u32 state) int sysdev_suspend(pm_message_t state)
{ {
struct sysdev_class * cls; struct sysdev_class * cls;

5
include/linux/pci.h
Просмотреть файл

@ -501,6 +501,7 @@ typedef int __bitwise pci_power_t;
#define PCI_D2 ((pci_power_t __force) 2) #define PCI_D2 ((pci_power_t __force) 2)
#define PCI_D3hot ((pci_power_t __force) 3) #define PCI_D3hot ((pci_power_t __force) 3)
#define PCI_D3cold ((pci_power_t __force) 4) #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. * The pci_dev structure is used to describe PCI devices.
@ -669,7 +670,7 @@ struct pci_driver {
void (*remove) (struct pci_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */ 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 (*suspend) (struct pci_dev *dev, pm_message_t state); /* Device suspended */
int (*resume) (struct pci_dev *dev); /* Device woken up */ 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 device_driver driver;
struct pci_dynids dynids; struct pci_dynids dynids;
@ -952,7 +953,7 @@ static inline const struct pci_device_id *pci_match_device(const struct pci_devi
static inline int pci_save_state(struct pci_dev *dev) { return 0; } 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_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 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; } 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) #define isa_bridge ((struct pci_dev *)NULL)

5
include/linux/sysdev.h
Просмотреть файл

@ -22,6 +22,7 @@
#define _SYSDEV_H_ #define _SYSDEV_H_
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/pm.h>
struct sys_device; struct sys_device;
@ -31,7 +32,7 @@ struct sysdev_class {
/* Default operations for these types of devices */ /* Default operations for these types of devices */
int (*shutdown)(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 *); int (*resume)(struct sys_device *);
struct kset kset; struct kset kset;
}; };
@ -50,7 +51,7 @@ struct sysdev_driver {
int (*add)(struct sys_device *); int (*add)(struct sys_device *);
int (*remove)(struct sys_device *); int (*remove)(struct sys_device *);
int (*shutdown)(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 *); int (*resume)(struct sys_device *);
}; };