Skip to content

Commit 1009926

Browse files
committed
Merge branch 'pci/typos'
- Fix typos and whitespace errors (Bjorn Helgaas) * pci/typos: PCI: Fix typos
2 parents 2d56427 + 31457d4 commit 1009926

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

drivers/pci/controller/pcie-rcar-host.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -796,8 +796,8 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host)
796796
rcar_pci_write_reg(pcie, 0, PCIEMSIIER);
797797

798798
/*
799-
* Setup MSI data target using RC base address address, which
800-
* is guaranteed to be in the low 32bit range on any R-Car HW.
799+
* Setup MSI data target using RC base address, which is guaranteed
800+
* to be in the low 32bit range on any R-Car HW.
801801
*/
802802
rcar_pci_write_reg(pcie, lower_32_bits(res.start) | MSIFE, PCIEMSIALR);
803803
rcar_pci_write_reg(pcie, upper_32_bits(res.start), PCIEMSIAUR);

drivers/pci/pcie/aer.c

+9-6
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ static int disable_ecrc_checking(struct pci_dev *dev)
180180
}
181181

182182
/**
183-
* pcie_set_ecrc_checking - set/unset PCIe ECRC checking for a device based on global policy
183+
* pcie_set_ecrc_checking - set/unset PCIe ECRC checking for a device based
184+
* on global policy
184185
* @dev: the PCI device
185186
*/
186187
void pcie_set_ecrc_checking(struct pci_dev *dev)
@@ -1148,14 +1149,16 @@ static void aer_recover_work_func(struct work_struct *work)
11481149
continue;
11491150
}
11501151
pci_print_aer(pdev, entry.severity, entry.regs);
1152+
11511153
/*
1152-
* Memory for aer_capability_regs(entry.regs) is being allocated from the
1153-
* ghes_estatus_pool to protect it from overwriting when multiple sections
1154-
* are present in the error status. Thus free the same after processing
1155-
* the data.
1154+
* Memory for aer_capability_regs(entry.regs) is being
1155+
* allocated from the ghes_estatus_pool to protect it from
1156+
* overwriting when multiple sections are present in the
1157+
* error status. Thus free the same after processing the
1158+
* data.
11561159
*/
11571160
ghes_estatus_pool_region_free((unsigned long)entry.regs,
1158-
sizeof(struct aer_capability_regs));
1161+
sizeof(struct aer_capability_regs));
11591162

11601163
if (entry.severity == AER_NONFATAL)
11611164
pcie_do_recovery(pdev, pci_channel_io_normal,

0 commit comments

Comments
 (0)