Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f4927c1 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] fix u32 vs. pm_message_t in PCI, PCIE 



This fixes drivers/pci (mostly pcie stuff).

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f4513904

drivers/pci/hotplug/pciehp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static void pciehp_remove (struct pcie_device *device) 
}



#ifdef CONFIG_PM

static int pciehp_suspend (struct pcie_device *dev, u32 state)

static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)

{

	printk("%s ENTRY\n", __FUNCTION__);	

	return 0;

drivers/pci/pcie/portdrv.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ extern struct bus_type pcie_port_bus_type; 
extern int pcie_port_device_probe(struct pci_dev *dev);

extern int pcie_port_device_register(struct pci_dev *dev);

#ifdef CONFIG_PM

extern int pcie_port_device_suspend(struct pci_dev *dev, u32 state);

extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);

extern int pcie_port_device_resume(struct pci_dev *dev);

#endif

extern void pcie_port_device_remove(struct pci_dev *dev);

drivers/pci/pcie/portdrv_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/pcieport_if.h>



static int pcie_port_bus_match(struct device *dev, struct device_driver *drv);

static int pcie_port_bus_suspend(struct device *dev, u32 state);

static int pcie_port_bus_suspend(struct device *dev, pm_message_t state);

static int pcie_port_bus_resume(struct device *dev);



struct bus_type pcie_port_bus_type = {
@@ -46,7 +46,7 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) 
	return 1;

}



static int pcie_port_bus_suspend(struct device *dev, u32 state)

static int pcie_port_bus_suspend(struct device *dev, pm_message_t state)

{

	struct pcie_device *pciedev;

	struct pcie_port_service_driver *driver;

drivers/pci/pcie/portdrv_core.c

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int pcie_port_remove_service(struct device *dev) 


static void pcie_port_shutdown_service(struct device *dev) {}



static int pcie_port_suspend_service(struct device *dev, u32 state, u32 level)

static int pcie_port_suspend_service(struct device *dev, pm_message_t state, u32 level)

{

	struct pcie_device *pciedev;

	struct pcie_port_service_driver *driver;
@@ -76,7 +76,7 @@ static int pcie_port_suspend_service(struct device *dev, u32 state, u32 level) 
	return 0;

}



static int pcie_port_resume_service(struct device *dev, u32 state)

static int pcie_port_resume_service(struct device *dev, u32 level)

{

	struct pcie_device *pciedev;

	struct pcie_port_service_driver *driver;
@@ -317,7 +317,7 @@ int pcie_port_device_register(struct pci_dev *dev) 
}



#ifdef CONFIG_PM

int pcie_port_device_suspend(struct pci_dev *dev, u32 state)

int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state)

{

	struct list_head 		*head, *tmp;

	struct device 			*parent, *child;

drivers/pci/pcie/portdrv_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void pcie_portdrv_remove (struct pci_dev *dev) 
}



#ifdef CONFIG_PM

static int pcie_portdrv_suspend (struct pci_dev *dev, u32 state)

static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)

{

	return pcie_port_device_suspend(dev, state);

}