From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 May 2019 23:34:48 +0000 (-0500)
Subject: Merge branch 'pci/trivial'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c7a1c2bbb65e25551d585fba0fd36a01e0a22690;p=linux.git

Merge branch 'pci/trivial'

  - Cleanup PCI register definitions, typos, etc (Bjorn Helgaas)

  - Remove unnecessary use of user-space types in CPER (Bjorn Helgaas)

  - Cleanup setup-bus.c comments & whitespace (Nicholas Johnson)

* pci/trivial:
  PCI: Cleanup setup-bus.c comments and whitespace
  CPER: Remove unnecessary use of user-space types
  CPER: Add UEFI spec references
  PCI: Fix comment typos
  PCI: Cleanup register definition width and whitespace

# Conflicts:
#	drivers/pci/pci.c
#	drivers/pci/setup-bus.c
---

c7a1c2bbb65e25551d585fba0fd36a01e0a22690
diff --cc drivers/pci/setup-bus.c
index c73e66725d051,6728144308c0e..0cdd5ff389de9
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@@ -1530,9 -1526,9 +1525,9 @@@ static void pci_bridge_release_resource
  	release_child_resources(r);
  	if (!release_resource(r)) {
  		type = old_flags = r->flags & PCI_RES_TYPE_MASK;
 -		pci_printk(KERN_DEBUG, dev, "resource %d %pR released\n",
 -					PCI_BRIDGE_RESOURCES + idx, r);
 +		pci_info(dev, "resource %d %pR released\n",
 +			 PCI_BRIDGE_RESOURCES + idx, r);
- 		/* keep the old size */
+ 		/* Keep the old size */
  		r->end = resource_size(r) - 1;
  		r->start = 0;
  		r->flags = 0;
@@@ -1764,10 -1763,10 +1761,10 @@@ again
  		goto dump;
  	}
  
 -	dev_printk(KERN_DEBUG, &bus->dev,
 -		   "No. %d try to assign unassigned res\n", tried_times + 1);
 +	dev_info(&bus->dev, "No. %d try to assign unassigned res\n",
 +		 tried_times + 1);
  
- 	/* third times and later will not check if it is leaf */
+ 	/* Third times and later will not check if it is leaf */
  	if ((tried_times + 1) > 2)
  		rel_type = whole_subtree;