Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5048a73 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/trivial' 

  - Fix typos and whitespace errors (Bjorn Helgaas, Krzysztof Wilczynski)

  - Remove unnecessary "return" statements (Krzysztof Wilczynski)

  - Correct of_irq_parse_pci() function documentation (Lubomir Rintel)

* pci/trivial:
  PCI: Remove unnecessary returns
  PCI: OF: Correct of_irq_parse_pci() documentation
  PCI: Fix typos and whitespace errors
parents cdc7e184 55507aea

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Additional required properties for imx7d-pcie and imx8mq-pcie: 
- power-domains: Must be set to a phandle pointing to PCIE_PHY power domain

- resets: Must contain phandles to PCIe-related reset lines exposed by SRC

  IP block

- reset-names: Must contain the following entires:

- reset-names: Must contain the following entries:

	       - "pciephy"

	       - "apps"

	       - "turnoff"

Documentation/devicetree/bindings/pci/pci-armada8k.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Required properties: 
- reg-names:

   - "ctrl" for the control register region

   - "config" for the config space region

- interrupts: Interrupt specifier for the PCIe controler

- interrupts: Interrupt specifier for the PCIe controller

- clocks: reference to the PCIe controller clocks

- clock-names: mandatory if there is a second clock, in this case the

   name must be "core" for the first clock and "reg" for the second

drivers/pci/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ config PCI_P2PDMA 


	  Many PCIe root complexes do not support P2P transactions and

	  it's hard to tell which support it at all, so at this time,

	  P2P DMA transations must be between devices behind the same root

	  P2P DMA transactions must be between devices behind the same root

	  port.



	  If unsure, say N.

drivers/pci/controller/pcie-mediatek.c

+0 −2
Original line number Diff line number Diff line
@@ -635,8 +635,6 @@ static void mtk_pcie_intr_handler(struct irq_desc *desc) 
	}



	chained_irq_exit(irqchip, desc);



	return;

}



static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,

drivers/pci/hotplug/cpci_hotplug_core.c

+0 −1
Original line number Diff line number Diff line
@@ -563,7 +563,6 @@ cleanup_slots(void) 
	}

cleanup_null:

	up_write(&list_rwsem);

	return;

}



int