From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 25 Sep 2014 19:52:02 +0000 (-0600)
Subject: Merge branches 'pci/enumeration', 'pci/virtualization' and 'pci/cleanup' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'pci/enumeration', 'pci/virtualization' and 'pci/cleanup' into next

* pci/enumeration:
  PCI: Generate uppercase hex for modalias interface class

* pci/virtualization:
  PCI: Add ACS quirk for Solarflare SFC9120 & SFC9140
  PCI: Remove unused pci_get_dma_source()
  PCI: Remove unused pci_find_upstream_pcie_bridge()

* pci/cleanup:
  PCI: Remove assignment from complicated "if" conditions
  PCI: Remove assignment from "if" conditions
  PCI: Remove unnecessary curly braces
  PCI: Add space before open parenthesis
---

c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4
diff --cc include/linux/pci.h
index d868c08eea63,61978a460841,d68d8e33c196,61978a460841..ef98f73ea618
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@@@ -1828,28 -1828,15 -1823,17 -1828,15 +1823,17 @@@@@ int pci_for_each_dma_alias(struct pci_d
    			   int (*fn)(struct pci_dev *pdev,
    				     u16 alias, void *data), void *data);
    
-- -/**
-- - * pci_find_upstream_pcie_bridge - find upstream PCIe-to-PCI bridge of a device
-- - * @pdev: the PCI device
-- - *
-- - * if the device is PCIE, return NULL
-- - * if the device isn't connected to a PCIe bridge (that is its parent is a
-- - * legacy PCI bridge and the bridge is directly connected to bus 0), return its
-- - * parent
-- - */
-- -struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev);
-- -
 + +/* helper functions for operation of device flag */
 + +static inline void pci_set_dev_assigned(struct pci_dev *pdev)
 + +{
 + +	pdev->dev_flags |= PCI_DEV_FLAGS_ASSIGNED;
 + +}
 + +static inline void pci_clear_dev_assigned(struct pci_dev *pdev)
 + +{
 + +	pdev->dev_flags &= ~PCI_DEV_FLAGS_ASSIGNED;
 + +}
 + +static inline bool pci_is_dev_assigned(struct pci_dev *pdev)
 + +{
 + +	return (pdev->dev_flags & PCI_DEV_FLAGS_ASSIGNED) == PCI_DEV_FLAGS_ASSIGNED;
 + +}
    #endif /* LINUX_PCI_H */