Commit 78be29ab authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Tidy setup-irq.c comments (Pranay Sanghai)

- Fix misspellings (Krzysztof Wilczyński)

- Fix sprintf(), sscanf() format mismatches (Krzysztof Wilczyński)

- Tidy cpqphp code formatting (Krzysztof Wilczyński)

- Remove unused pci_pool wrappers, which have been replaced by dma_pool
  (Cai Huoqing)

- Remove a redundant initialization in __pci_reset_function_locked() (Colin
  Ian King)

- Use 'unsigned int' instead of 'unsigned' (Krzysztof Wilczyński)

- Update PCI subsystem information in MAINTAINERS (Krzysztof Wilczyński)

- Include generic <linux/> headers instead of <asm/> for cpqphp and vmd
  (Krzysztof Wilczyński)

* pci/misc:
  PCI: vmd: Drop redundant includes of <asm/device.h>, <asm/msi.h>
  PCI: cpqphp: Use <linux/io.h> instead of <asm/io.h>
  MAINTAINERS: Update PCI subsystem information
  PCI: Prefer 'unsigned int' over bare 'unsigned'
  PCI: Remove redundant 'rc' initialization
  PCI: Remove unused pci_pool wrappers
  PCI: cpqphp: Format if-statement code block correctly
  PCI: Use unsigned to match sscanf("%x") in pci_dev_str_match_path()
  PCI: hv: Remove unnecessary use of %hx
  PCI: Correct misspelled and remove duplicated words
  PCI: Tidy comments
parents 10d0f97f ca25c637

MAINTAINERS

+13 −4
Original line number Diff line number Diff line
@@ -14440,9 +14440,12 @@ M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> 
R:	Krzysztof Wilczyński <kw@linux.com>

L:	linux-pci@vger.kernel.org

S:	Supported

Q:	https://patchwork.kernel.org/project/linux-pci/list/

B:	https://bugzilla.kernel.org

C:	irc://irc.oftc.net/linux-pci

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git

F:	Documentation/PCI/endpoint/*

F:	Documentation/misc-devices/pci-endpoint-test.rst

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git

F:	drivers/misc/pci_endpoint_test.c

F:	drivers/pci/endpoint/

F:	tools/pci/
@@ -14488,15 +14491,21 @@ R: Rob Herring <robh@kernel.org> 
R:	Krzysztof Wilczyński <kw@linux.com>

L:	linux-pci@vger.kernel.org

S:	Supported

Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/

Q:	https://patchwork.kernel.org/project/linux-pci/list/

B:	https://bugzilla.kernel.org

C:	irc://irc.oftc.net/linux-pci

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git

F:	drivers/pci/controller/

F:	drivers/pci/pci-bridge-emul.c

F:	drivers/pci/pci-bridge-emul.h









PCI SUBSYSTEM









M:	Bjorn Helgaas <bhelgaas@google.com>









L:	linux-pci@vger.kernel.org









S:	Supported









Q:	http://patchwork.ozlabs.org/project/linux-pci/list/









Q:	https://patchwork.kernel.org/project/linux-pci/list/









B:	https://bugzilla.kernel.org









C:	irc://irc.oftc.net/linux-pci









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git









F:	Documentation/PCI/









F:	Documentation/devicetree/bindings/pci/
































drivers/pci/controller/pci-hyperv.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -3126,14 +3126,14 @@ static int hv_pci_probe(struct hv_device *hdev,

















	if (dom == HVPCI_DOM_INVALID) {









		dev_err(&hdev->device,









			"Unable to use dom# 0x%hx or other numbers", dom_req);









			"Unable to use dom# 0x%x or other numbers", dom_req);









		ret = -EINVAL;









		goto free_bus;









	}



















	if (dom != dom_req)









		dev_info(&hdev->device,









			 "PCI dom# 0x%hx has collision, using 0x%hx",









			 "PCI dom# 0x%x has collision, using 0x%x",









			 dom_req, dom);



















	hbus->bridge->domain_nr = dom;
































drivers/pci/controller/pci-thunder-ecam.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -17,7 +17,7 @@ static void set_val(u32 v, int where, int size, u32 *val)







{









	int shift = (where & 3) * 8;



















	pr_debug("set_val %04x: %08x\n", (unsigned)(where & ~3), v);









	pr_debug("set_val %04x: %08x\n", (unsigned int)(where & ~3), v);









	v >>= shift;









	if (size == 1)









		v &= 0xff;








@@ -187,7 +187,7 @@ static int thunder_ecam_config_read(struct pci_bus *bus, unsigned int devfn,

















	pr_debug("%04x:%04x - Fix pass#: %08x, where: %03x, devfn: %03x\n",









		 vendor_device & 0xffff, vendor_device >> 16, class_rev,









		 (unsigned) where, devfn);









		 (unsigned int)where, devfn);



















	/* Check for non type-00 header */









	if (cfg_type == 0) {
































drivers/pci/controller/pci-xgene-msi.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -302,7 +302,7 @@ static void xgene_msi_isr(struct irq_desc *desc)

















	/*









	 * MSIINTn (n is 0..F) indicates if there is a pending MSI interrupt









	 * If bit x of this register is set (x is 0..7), one or more interupts









	 * If bit x of this register is set (x is 0..7), one or more interrupts









	 * corresponding to MSInIRx is set.









	 */









	grp_select = xgene_msi_int_read(xgene_msi, msi_grp);
































drivers/pci/controller/pcie-brcmstb.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -145,7 +145,7 @@







#define BRCM_INT_PCI_MSI_LEGACY_NR	8









#define BRCM_INT_PCI_MSI_SHIFT		0



















/* MSI target adresses */









/* MSI target addresses */









#define BRCM_MSI_TARGET_ADDR_LT_4GB	0x0fffffffcULL









#define BRCM_MSI_TARGET_ADDR_GT_4GB	0xffffffffcULL