View | Details | Raw Unified | Return to bug 61891 | Differences between
and this patch

Collapse All | Expand All

(-)linux-pm/drivers/pci/pci.c (+11 lines)
Lines 4319-4324 bool pci_device_is_present(struct pci_de Link Here
4319
}
4319
}
4320
EXPORT_SYMBOL_GPL(pci_device_is_present);
4320
EXPORT_SYMBOL_GPL(pci_device_is_present);
4321
4321
4322
void pci_ignore_hotplug(struct pci_dev *dev)
4323
{
4324
	struct pci_dev *bridge = dev->bus->self;
4325
4326
	dev->ignore_hotplug = 1;
4327
	/* Propagate the "ignore hotplug" setting to the parent bridge. */
4328
	if (bridge)
4329
		bridge->ignore_hotplug = 1;
4330
}
4331
EXPORT_SYMBOL_GPL(pci_ignore_hotplug);
4332
4322
#define RESOURCE_ALIGNMENT_PARAM_SIZE COMMAND_LINE_SIZE
4333
#define RESOURCE_ALIGNMENT_PARAM_SIZE COMMAND_LINE_SIZE
4323
static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};
4334
static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0};
4324
static DEFINE_SPINLOCK(resource_alignment_lock);
4335
static DEFINE_SPINLOCK(resource_alignment_lock);
(-)linux-pm/include/linux/pci.h (-5 / +1 lines)
Lines 1002-1007 int __must_check pci_assign_resource(str Link Here
1002
int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
1002
int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
1003
int pci_select_bars(struct pci_dev *dev, unsigned long flags);
1003
int pci_select_bars(struct pci_dev *dev, unsigned long flags);
1004
bool pci_device_is_present(struct pci_dev *pdev);
1004
bool pci_device_is_present(struct pci_dev *pdev);
1005
void pci_ignore_hotplug(struct pci_dev *dev);
1005
1006
1006
/* ROM control related routines */
1007
/* ROM control related routines */
1007
int pci_enable_rom(struct pci_dev *pdev);
1008
int pci_enable_rom(struct pci_dev *pdev);
Lines 1039-1049 bool pci_dev_run_wake(struct pci_dev *de Link Here
1039
bool pci_check_pme_status(struct pci_dev *dev);
1040
bool pci_check_pme_status(struct pci_dev *dev);
1040
void pci_pme_wakeup_bus(struct pci_bus *bus);
1041
void pci_pme_wakeup_bus(struct pci_bus *bus);
1041
1042
1042
static inline void pci_ignore_hotplug(struct pci_dev *dev)
1043
{
1044
	dev->ignore_hotplug = 1;
1045
}
1046
1047
static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
1043
static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
1048
				  bool enable)
1044
				  bool enable)
1049
{
1045
{

Return to bug 61891