mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-01 10:43:43 +00:00
Merge branch 'pci/typos'
- Fix typos and whitespace errors (Bjorn Helgaas) * pci/typos: PCI: Fix typos
This commit is contained in:
commit
10099266de
@ -796,8 +796,8 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host)
|
||||
rcar_pci_write_reg(pcie, 0, PCIEMSIIER);
|
||||
|
||||
/*
|
||||
* Setup MSI data target using RC base address address, which
|
||||
* is guaranteed to be in the low 32bit range on any R-Car HW.
|
||||
* Setup MSI data target using RC base address, which is guaranteed
|
||||
* to be in the low 32bit range on any R-Car HW.
|
||||
*/
|
||||
rcar_pci_write_reg(pcie, lower_32_bits(res.start) | MSIFE, PCIEMSIALR);
|
||||
rcar_pci_write_reg(pcie, upper_32_bits(res.start), PCIEMSIAUR);
|
||||
|
@ -180,7 +180,8 @@ static int disable_ecrc_checking(struct pci_dev *dev)
|
||||
}
|
||||
|
||||
/**
|
||||
* pcie_set_ecrc_checking - set/unset PCIe ECRC checking for a device based on global policy
|
||||
* pcie_set_ecrc_checking - set/unset PCIe ECRC checking for a device based
|
||||
* on global policy
|
||||
* @dev: the PCI device
|
||||
*/
|
||||
void pcie_set_ecrc_checking(struct pci_dev *dev)
|
||||
@ -1148,14 +1149,16 @@ static void aer_recover_work_func(struct work_struct *work)
|
||||
continue;
|
||||
}
|
||||
pci_print_aer(pdev, entry.severity, entry.regs);
|
||||
|
||||
/*
|
||||
* Memory for aer_capability_regs(entry.regs) is being allocated from the
|
||||
* ghes_estatus_pool to protect it from overwriting when multiple sections
|
||||
* are present in the error status. Thus free the same after processing
|
||||
* the data.
|
||||
* Memory for aer_capability_regs(entry.regs) is being
|
||||
* allocated from the ghes_estatus_pool to protect it from
|
||||
* overwriting when multiple sections are present in the
|
||||
* error status. Thus free the same after processing the
|
||||
* data.
|
||||
*/
|
||||
ghes_estatus_pool_region_free((unsigned long)entry.regs,
|
||||
sizeof(struct aer_capability_regs));
|
||||
sizeof(struct aer_capability_regs));
|
||||
|
||||
if (entry.severity == AER_NONFATAL)
|
||||
pcie_do_recovery(pdev, pci_channel_io_normal,
|
||||
|
Loading…
Reference in New Issue
Block a user