Commit c5048a73 authored by Bjorn Helgaas's avatar Bjorn Helgaas

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
...@@ -50,7 +50,7 @@ Additional required properties for imx7d-pcie and imx8mq-pcie: ...@@ -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 - 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 - resets: Must contain phandles to PCIe-related reset lines exposed by SRC
IP block IP block
- reset-names: Must contain the following entires: - reset-names: Must contain the following entries:
- "pciephy" - "pciephy"
- "apps" - "apps"
- "turnoff" - "turnoff"
......
...@@ -11,7 +11,7 @@ Required properties: ...@@ -11,7 +11,7 @@ Required properties:
- reg-names: - reg-names:
- "ctrl" for the control register region - "ctrl" for the control register region
- "config" for the config space 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 - clocks: reference to the PCIe controller clocks
- clock-names: mandatory if there is a second clock, in this case the - 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 name must be "core" for the first clock and "reg" for the second
......
...@@ -170,7 +170,7 @@ config PCI_P2PDMA ...@@ -170,7 +170,7 @@ config PCI_P2PDMA
Many PCIe root complexes do not support P2P transactions and Many PCIe root complexes do not support P2P transactions and
it's hard to tell which support it at all, so at this time, 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. port.
If unsure, say N. If unsure, say N.
......
...@@ -635,8 +635,6 @@ static void mtk_pcie_intr_handler(struct irq_desc *desc) ...@@ -635,8 +635,6 @@ static void mtk_pcie_intr_handler(struct irq_desc *desc)
} }
chained_irq_exit(irqchip, desc); chained_irq_exit(irqchip, desc);
return;
} }
static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,
......
...@@ -563,7 +563,6 @@ cleanup_slots(void) ...@@ -563,7 +563,6 @@ cleanup_slots(void)
} }
cleanup_null: cleanup_null:
up_write(&list_rwsem); up_write(&list_rwsem);
return;
} }
int int
......
...@@ -173,7 +173,6 @@ static void pci_print_IRQ_route(void) ...@@ -173,7 +173,6 @@ static void pci_print_IRQ_route(void)
dbg("%d %d %d %d\n", tbus, tdevice >> 3, tdevice & 0x7, tslot); dbg("%d %d %d %d\n", tbus, tdevice >> 3, tdevice & 0x7, tslot);
} }
return;
} }
......
...@@ -1872,8 +1872,6 @@ static void interrupt_event_handler(struct controller *ctrl) ...@@ -1872,8 +1872,6 @@ static void interrupt_event_handler(struct controller *ctrl)
} }
} /* End of FOR loop */ } /* End of FOR loop */
} }
return;
} }
...@@ -1943,8 +1941,6 @@ void cpqhp_pushbutton_thread(struct timer_list *t) ...@@ -1943,8 +1941,6 @@ void cpqhp_pushbutton_thread(struct timer_list *t)
p_slot->state = STATIC_STATE; p_slot->state = STATIC_STATE;
} }
return;
} }
......
...@@ -16,10 +16,7 @@ ...@@ -16,10 +16,7 @@
#ifndef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM #ifndef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
static inline void compaq_nvram_init(void __iomem *rom_start) static inline void compaq_nvram_init(void __iomem *rom_start) { }
{
return;
}
static inline int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl) static inline int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl)
{ {
......
...@@ -473,7 +473,6 @@ int __init rpadlpar_io_init(void) ...@@ -473,7 +473,6 @@ int __init rpadlpar_io_init(void)
void rpadlpar_io_exit(void) void rpadlpar_io_exit(void)
{ {
dlpar_sysfs_exit(); dlpar_sysfs_exit();
return;
} }
module_init(rpadlpar_io_init); module_init(rpadlpar_io_init);
......
...@@ -412,7 +412,6 @@ static void __exit cleanup_slots(void) ...@@ -412,7 +412,6 @@ static void __exit cleanup_slots(void)
pci_hp_deregister(&slot->hotplug_slot); pci_hp_deregister(&slot->hotplug_slot);
dealloc_slot_struct(slot); dealloc_slot_struct(slot);
} }
return;
} }
static int __init rpaphp_init(void) static int __init rpaphp_init(void)
......
...@@ -353,7 +353,7 @@ EXPORT_SYMBOL_GPL(devm_of_pci_get_host_bridge_resources); ...@@ -353,7 +353,7 @@ EXPORT_SYMBOL_GPL(devm_of_pci_get_host_bridge_resources);
/** /**
* of_irq_parse_pci - Resolve the interrupt for a PCI device * of_irq_parse_pci - Resolve the interrupt for a PCI device
* @pdev: the device whose interrupt is to be resolved * @pdev: the device whose interrupt is to be resolved
* @out_irq: structure of_irq filled by this function * @out_irq: structure of_phandle_args filled by this function
* *
* This function resolves the PCI interrupt for a given PCI device. If a * This function resolves the PCI interrupt for a given PCI device. If a
* device-node exists for a given pci_dev, it will use normal OF tree * device-node exists for a given pci_dev, it will use normal OF tree
......
...@@ -411,7 +411,6 @@ void pci_restore_vc_state(struct pci_dev *dev) ...@@ -411,7 +411,6 @@ void pci_restore_vc_state(struct pci_dev *dev)
* For each type of VC capability, VC/VC9/MFVC, find the capability, size * For each type of VC capability, VC/VC9/MFVC, find the capability, size
* it, and allocate a buffer for save/restore. * it, and allocate a buffer for save/restore.
*/ */
void pci_allocate_vc_save_buffers(struct pci_dev *dev) void pci_allocate_vc_save_buffers(struct pci_dev *dev)
{ {
int i; int i;
......
...@@ -971,7 +971,7 @@ resource_size_t pcibios_align_resource(void *, const struct resource *, ...@@ -971,7 +971,7 @@ resource_size_t pcibios_align_resource(void *, const struct resource *,
resource_size_t, resource_size_t,
resource_size_t); resource_size_t);
/* Weak but can be overriden by arch */ /* Weak but can be overridden by arch */
void pci_fixup_cardbus(struct pci_bus *); void pci_fixup_cardbus(struct pci_bus *);
/* Generic PCI functions used internally */ /* Generic PCI functions used internally */
...@@ -1791,7 +1791,7 @@ static inline int pci_ats_page_aligned(struct pci_dev *dev) { return 0; } ...@@ -1791,7 +1791,7 @@ static inline int pci_ats_page_aligned(struct pci_dev *dev) { return 0; }
#include <asm/pci.h> #include <asm/pci.h>
/* These two functions provide almost identical functionality. Depennding /* These two functions provide almost identical functionality. Depending
* on the architecture, one will be implemented as a wrapper around the * on the architecture, one will be implemented as a wrapper around the
* other (in drivers/pci/mmap.c). * other (in drivers/pci/mmap.c).
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment