Commit e002bcc2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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
parents 75f50020 b08508c4

drivers/pci/pcie/aspm.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

			&reg32);

		if (!(reg32 & PCI_EXP_DEVCAP_RBER && !aspm_force)) {

		if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {

			printk("Pre-1.1 PCIe device detected, "

				"disable ASPM for %s. It can be enabled forcedly"

				" with 'pcie_aspm=force'\n", pci_name(pdev));

drivers/pci/search.c

+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ EXPORT_SYMBOL(pci_find_slot); 
 * time.

 */

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;
@@ -263,7 +263,7 @@ static int match_pci_dev_by_id(struct device *dev, void *data) 
 * this file.

 */

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_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,

			       unsigned int ss_vendor, unsigned int ss_device,

			       const struct pci_dev *from)

			       struct pci_dev *from)

{

	struct pci_dev *pdev;

	struct pci_device_id *id;

include/linux/pci.h

+4 −4
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ extern void pci_sort_breadthfirst(void); 
#ifdef CONFIG_PCI_LEGACY

struct pci_dev __deprecated *pci_find_device(unsigned int vendor,

					     unsigned int device,

					     const struct pci_dev *from);

					     struct pci_dev *from);

struct pci_dev __deprecated *pci_find_slot(unsigned int bus,

					   unsigned int devfn);

#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 *pci_get_subsys(unsigned int vendor, unsigned int 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_bus_and_slot(unsigned int bus, unsigned int devfn);

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,

					      unsigned int device,

					      const struct pci_dev *from)

					      struct pci_dev *from)

{

	return NULL;

}
@@ -838,7 +838,7 @@ static inline struct pci_dev *pci_get_subsys(unsigned int vendor, 
					     unsigned int device,

					     unsigned int ss_vendor,

					     unsigned int ss_device,

					     const struct pci_dev *from)

					     struct pci_dev *from)

{

	return NULL;

}