tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] fix u32 vs. pm_message_t in PCI, PCIE
This fixes drivers/pci (mostly pcie stuff).
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by
Pavel Machek
and committed by
Linus Torvalds
7f4927c1
f4513904
+9
-9
+1
-1
drivers/pci/hotplug/pciehp_core.c
+1
-1
drivers/pci/hotplug/pciehp_core.c
+1
-1
drivers/pci/pcie/portdrv.h
+1
-1
drivers/pci/pcie/portdrv.h
···
31
31
extern int pcie_port_device_probe(struct pci_dev *dev);
32
32
extern int pcie_port_device_register(struct pci_dev *dev);
33
33
#ifdef CONFIG_PM
34
-
extern int pcie_port_device_suspend(struct pci_dev *dev, u32 state);
34
+
extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);
35
35
extern int pcie_port_device_resume(struct pci_dev *dev);
36
36
#endif
37
37
extern void pcie_port_device_remove(struct pci_dev *dev);
+2
-2
drivers/pci/pcie/portdrv_bus.c
+2
-2
drivers/pci/pcie/portdrv_bus.c
···
15
15
#include <linux/pcieport_if.h>
16
16
17
17
static int pcie_port_bus_match(struct device *dev, struct device_driver *drv);
18
-
static int pcie_port_bus_suspend(struct device *dev, u32 state);
18
+
static int pcie_port_bus_suspend(struct device *dev, pm_message_t state);
19
19
static int pcie_port_bus_resume(struct device *dev);
20
20
21
21
struct bus_type pcie_port_bus_type = {
···
46
46
return 1;
47
47
}
48
48
49
-
static int pcie_port_bus_suspend(struct device *dev, u32 state)
49
+
static int pcie_port_bus_suspend(struct device *dev, pm_message_t state)
50
50
{
51
51
struct pcie_device *pciedev;
52
52
struct pcie_port_service_driver *driver;
+3
-3
drivers/pci/pcie/portdrv_core.c
+3
-3
drivers/pci/pcie/portdrv_core.c
···
61
61
62
62
static void pcie_port_shutdown_service(struct device *dev) {}
63
63
64
-
static int pcie_port_suspend_service(struct device *dev, u32 state, u32 level)
64
+
static int pcie_port_suspend_service(struct device *dev, pm_message_t state, u32 level)
65
65
{
66
66
struct pcie_device *pciedev;
67
67
struct pcie_port_service_driver *driver;
···
76
76
return 0;
77
77
}
78
78
79
-
static int pcie_port_resume_service(struct device *dev, u32 state)
79
+
static int pcie_port_resume_service(struct device *dev, u32 level)
80
80
{
81
81
struct pcie_device *pciedev;
82
82
struct pcie_port_service_driver *driver;
···
317
317
}
318
318
319
319
#ifdef CONFIG_PM
320
-
int pcie_port_device_suspend(struct pci_dev *dev, u32 state)
320
+
int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state)
321
321
{
322
322
struct list_head *head, *tmp;
323
323
struct device *parent, *child;
+1
-1
drivers/pci/pcie/portdrv_pci.c
+1
-1
drivers/pci/pcie/portdrv_pci.c
+1
-1
include/linux/pcieport_if.h
+1
-1
include/linux/pcieport_if.h
···
59
59
int (*probe) (struct pcie_device *dev,
60
60
const struct pcie_port_service_id *id);
61
61
void (*remove) (struct pcie_device *dev);
62
-
int (*suspend) (struct pcie_device *dev, u32 state);
62
+
int (*suspend) (struct pcie_device *dev, pm_message_t state);
63
63
int (*resume) (struct pcie_device *dev);
64
64
65
65
const struct pcie_port_service_id *id_table;