Commit a0f75f9d495b3905b4c658c1d813a127f558a350
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
Merge branch 'pci/misc' into next
* pci/misc: MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci PCI: Add CircuitCo vendor ID and subsystem ID PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
Showing 4 changed files Side-by-side Diff
MAINTAINERS
drivers/pci/pci.c
drivers/pci/quirks.c
| ... | ... | @@ -1834,7 +1834,6 @@ |
| 1834 | 1834 | u16 command, pmcsr; |
| 1835 | 1835 | u8 __iomem *csr; |
| 1836 | 1836 | u8 cmd_hi; |
| 1837 | - int pm; | |
| 1838 | 1837 | |
| 1839 | 1838 | switch (dev->device) { |
| 1840 | 1839 | /* PCI IDs taken from drivers/net/e100.c */ |
| ... | ... | @@ -1872,9 +1871,8 @@ |
| 1872 | 1871 | * Check that the device is in the D0 power state. If it's not, |
| 1873 | 1872 | * there is no point to look any further. |
| 1874 | 1873 | */ |
| 1875 | - pm = pci_find_capability(dev, PCI_CAP_ID_PM); | |
| 1876 | - if (pm) { | |
| 1877 | - pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr); | |
| 1874 | + if (dev->pm_cap) { | |
| 1875 | + pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); | |
| 1878 | 1876 | if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) |
| 1879 | 1877 | return; |
| 1880 | 1878 | } |
include/linux/pci_ids.h
| ... | ... | @@ -2476,6 +2476,9 @@ |
| 2476 | 2476 | |
| 2477 | 2477 | #define PCI_VENDOR_ID_ASMEDIA 0x1b21 |
| 2478 | 2478 | |
| 2479 | +#define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 | |
| 2480 | +#define PCI_SUBSYSTEM_ID_CIRCUITCO_MINNOWBOARD 0x0001 | |
| 2481 | + | |
| 2479 | 2482 | #define PCI_VENDOR_ID_TEKRAM 0x1de1 |
| 2480 | 2483 | #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29 |
| 2481 | 2484 |