Skip to content

Commit

Permalink
Merge branch 'pci/trivial'
Browse files Browse the repository at this point in the history
  - 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
  • Loading branch information
Bjorn Helgaas committed Sep 23, 2019
2 parents cdc7e18 + 55507ae commit c5048a7
Show file tree
Hide file tree
Showing 13 changed files with 7 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/pci/pci-armada8k.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions drivers/pci/controller/pcie-mediatek.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion drivers/pci/hotplug/cpci_hotplug_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@ cleanup_slots(void)
}
cleanup_null:
up_write(&list_rwsem);
return;
}

int
Expand Down
1 change: 0 additions & 1 deletion drivers/pci/hotplug/cpqphp_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ static void pci_print_IRQ_route(void)
dbg("%d %d %d %d\n", tbus, tdevice >> 3, tdevice & 0x7, tslot);

}
return;
}


Expand Down
4 changes: 0 additions & 4 deletions drivers/pci/hotplug/cpqphp_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1872,8 +1872,6 @@ static void interrupt_event_handler(struct controller *ctrl)
}
} /* End of FOR loop */
}

return;
}


Expand Down Expand Up @@ -1943,8 +1941,6 @@ void cpqhp_pushbutton_thread(struct timer_list *t)

p_slot->state = STATIC_STATE;
}

return;
}


Expand Down
5 changes: 1 addition & 4 deletions drivers/pci/hotplug/cpqphp_nvram.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@

#ifndef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM

static inline void compaq_nvram_init(void __iomem *rom_start)
{
return;
}
static inline void compaq_nvram_init(void __iomem *rom_start) { }

static inline int compaq_nvram_load(void __iomem *rom_start, struct controller *ctrl)
{
Expand Down
1 change: 0 additions & 1 deletion drivers/pci/hotplug/rpadlpar_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ int __init rpadlpar_io_init(void)
void rpadlpar_io_exit(void)
{
dlpar_sysfs_exit();
return;
}

module_init(rpadlpar_io_init);
Expand Down
1 change: 0 additions & 1 deletion drivers/pci/hotplug/rpaphp_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,6 @@ static void __exit cleanup_slots(void)
pci_hp_deregister(&slot->hotplug_slot);
dealloc_slot_struct(slot);
}
return;
}

static int __init rpaphp_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/of.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* @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
* device-node exists for a given pci_dev, it will use normal OF tree
Expand Down
1 change: 0 additions & 1 deletion drivers/pci/vc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* it, and allocate a buffer for save/restore.
*/

void pci_allocate_vc_save_buffers(struct pci_dev *dev)
{
int i;
Expand Down
4 changes: 2 additions & 2 deletions include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ resource_size_t pcibios_align_resource(void *, const struct resource *,
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 *);

/* Generic PCI functions used internally */
Expand Down Expand Up @@ -1791,7 +1791,7 @@ static inline int pci_ats_page_aligned(struct pci_dev *dev) { return 0; }

#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
* other (in drivers/pci/mmap.c).
*
Expand Down

0 comments on commit c5048a7

Please sign in to comment.