Merge branch 'pci/trivial' into next

* pci/trivial:
  PCI: Clean up whitespace in linux/pci.h, pci/pci.h
  PCI: Tidy up pci/probe.c comments

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/probe.c
index 815c821fe950b8f51f85db9b6497ef9310154d67,4c62d966d545b18813e8cc7215bb7bec913850ca..2c673a65d5b0e7aefe8309a7e881bd266e02cc12
--- 1/drivers/pci/probe.c
--- 2/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -1058,9 -1061,10 +1061,10 @@@ static int pci_scan_bridge_extend(struc
  
                cmax = pci_scan_child_bus(child);
                if (cmax > subordinate)
 -                      dev_warn(&dev->dev, "bridge has subordinate %02x but max busn %02x\n",
 +                      pci_warn(dev, "bridge has subordinate %02x but max busn %02x\n",
                                 subordinate, cmax);
-               /* subordinate should equal child->busn_res.end */
+ 
+               /* Subordinate should equal child->busn_res.end */
                if (subordinate > max)
                        max = subordinate;
        } else {
@@@ -1468,13 -1480,13 +1480,13 @@@ int pci_setup_device(struct pci_dev *de
        dev->revision = class & 0xff;
        dev->class = class >> 8;                    /* upper 3 bytes */
  
 -      dev_printk(KERN_DEBUG, &dev->dev, "[%04x:%04x] type %02x class %#08x\n",
 +      pci_printk(KERN_DEBUG, dev, "[%04x:%04x] type %02x class %#08x\n",
                   dev->vendor, dev->device, dev->hdr_type, dev->class);
  
-       /* need to have dev->class ready */
+       /* Need to have dev->class ready */
        dev->cfg_size = pci_cfg_space_size(dev);
  
-       /* need to have dev->cfg_size ready */
+       /* Need to have dev->cfg_size ready */
        set_pcie_thunderbolt(dev);
  
        /* "Unknown power state" */

diff --cc include/linux/pci.h
index 656989b00666989116ada3a14f2445826f9655ea,ff5f5124aaccfa9240723f071a5ffd68b9ca2664..a1e10ba7b6120f330f03754880e7f79fba16f767
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -350,14 -345,12 +345,14 @@@ struct pci_dev 
  
  #ifdef CONFIG_PCIEASPM
        struct pcie_link_state  *link_state;    /* ASPM link state */
 +      unsigned int    ltr_path:1;     /* Latency Tolerance Reporting
 +                                         supported from root to here */
  #endif
  
-       pci_channel_state_t error_state;        /* current connectivity state */
-       struct  device  dev;            /* Generic device interface */
+       pci_channel_state_t error_state;        /* Current connectivity state */
+       struct device   dev;                    /* Generic device interface */
  
-       int             cfg_size;       /* Size of configuration space */
+       int             cfg_size;               /* Size of config space */
  
        /*
         * Instead of touching interrupt line and base address registers
@@@ -2288,19 -2257,7 +2267,19 @@@ static inline bool pci_is_thunderbolt_a
        return false;
  }
  
- /* provide the legacy pci_dma_* API */
+ /* Provide the legacy pci_dma_* API */
  #include <linux/pci-dma-compat.h>
  
 +#define pci_printk(level, pdev, fmt, arg...) \
 +      dev_printk(level, &(pdev)->dev, fmt, ##arg)
 +
 +#define pci_emerg(pdev, fmt, arg...)  dev_emerg(&(pdev)->dev, fmt, ##arg)
 +#define pci_alert(pdev, fmt, arg...)  dev_alert(&(pdev)->dev, fmt, ##arg)
 +#define pci_crit(pdev, fmt, arg...)   dev_crit(&(pdev)->dev, fmt, ##arg)
 +#define pci_err(pdev, fmt, arg...)    dev_err(&(pdev)->dev, fmt, ##arg)
 +#define pci_warn(pdev, fmt, arg...)   dev_warn(&(pdev)->dev, fmt, ##arg)
 +#define pci_notice(pdev, fmt, arg...) dev_notice(&(pdev)->dev, fmt, ##arg)
 +#define pci_info(pdev, fmt, arg...)   dev_info(&(pdev)->dev, fmt, ##arg)
 +#define pci_dbg(pdev, fmt, arg...)    dev_dbg(&(pdev)->dev, fmt, ##arg)
 +
  #endif /* LINUX_PCI_H */