iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: fix compiler warnings in pci_get_subsys()
  PCI: Fix pcie_aspm=force
This commit is contained in:
Linus Torvalds 2008-09-23 12:15:50 -07:00
commit e002bcc2f8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pcie/aspm.c
View File

@ -527,7 +527,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
*/ */
pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP, pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
&reg32); &reg32);
if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) { if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
printk("Pre-1.1 PCIe device detected, " printk("Pre-1.1 PCIe device detected, "
"disable ASPM for %s. It can be enabled forcedly" "disable ASPM for %s. It can be enabled forcedly"
" with 'pcie_aspm=force'\n", pci_name(pdev)); " with 'pcie_aspm=force'\n", pci_name(pdev));

6
drivers/pci/search.c
View File

@ -162,7 +162,7 @@ EXPORT_SYMBOL(pci_find_slot);
* time. * time.
*/ */
struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
const struct pci_dev *from) struct pci_dev *from)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
@ -263,7 +263,7 @@ static int match_pci_dev_by_id(struct device *dev, void *data)
* this file. * this file.
*/ */
static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
const struct pci_dev *from) struct pci_dev *from)
{ {
struct device *dev; struct device *dev;
struct device *dev_start = NULL; struct device *dev_start = NULL;
@ -303,7 +303,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
*/ */
struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
unsigned int ss_vendor, unsigned int ss_device, unsigned int ss_vendor, unsigned int ss_device,
const struct pci_dev *from) struct pci_dev *from)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
struct pci_device_id *id; struct pci_device_id *id;

8
include/linux/pci.h
View File

@ -534,7 +534,7 @@ extern void pci_sort_breadthfirst(void);
#ifdef CONFIG_PCI_LEGACY #ifdef CONFIG_PCI_LEGACY
struct pci_dev __deprecated *pci_find_device(unsigned int vendor, struct pci_dev __deprecated *pci_find_device(unsigned int vendor,
unsigned int device, unsigned int device,
const struct pci_dev *from); struct pci_dev *from);
struct pci_dev __deprecated *pci_find_slot(unsigned int bus, struct pci_dev __deprecated *pci_find_slot(unsigned int bus,
unsigned int devfn); unsigned int devfn);
#endif /* CONFIG_PCI_LEGACY */ #endif /* CONFIG_PCI_LEGACY */
@ -550,7 +550,7 @@ struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
struct pci_dev *from); struct pci_dev *from);
struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
unsigned int ss_vendor, unsigned int ss_device, unsigned int ss_vendor, unsigned int ss_device,
const struct pci_dev *from); struct pci_dev *from);
struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn); struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn);
struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn); struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn);
struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from); struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from);
@ -816,7 +816,7 @@ _PCI_NOP_ALL(write,)
static inline struct pci_dev *pci_find_device(unsigned int vendor, static inline struct pci_dev *pci_find_device(unsigned int vendor,
unsigned int device, unsigned int device,
const struct pci_dev *from) struct pci_dev *from)
{ {
return NULL; return NULL;
} }
@ -838,7 +838,7 @@ static inline struct pci_dev *pci_get_subsys(unsigned int vendor,
unsigned int device, unsigned int device,
unsigned int ss_vendor, unsigned int ss_vendor,
unsigned int ss_device, unsigned int ss_device,
const struct pci_dev *from) struct pci_dev *from)
{ {
return NULL; return NULL;
} }