Skip to content

Commit 727de4c

Browse files
bulwahnLorenzo Pieralisi
authored andcommitted
PCI: rcar: Avoid defines prefixed with CONFIG
Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file. In the R-car driver the bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE. Rename this local definition to a more suitable name, containing the register bitfield name defined in the R-Car Gen3 rev. 2.30 user manual. No functional change. Link: https://lore.kernel.org/r/20230113084516.31888-1-lukas.bulwahn@gmail.com Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> [lpieralisi@kernel.org: Changed define naming and commit log] Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
1 parent fe15c26 commit 727de4c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ static int rcar_pcie_config_access(struct rcar_pcie_host *host,
219219

220220
/* Enable the configuration access */
221221
if (pci_is_root_bus(bus->parent))
222-
rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE0, PCIECCTLR);
222+
rcar_pci_write_reg(pcie, PCIECCTLR_CCIE | TYPE0, PCIECCTLR);
223223
else
224-
rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE1, PCIECCTLR);
224+
rcar_pci_write_reg(pcie, PCIECCTLR_CCIE | TYPE1, PCIECCTLR);
225225

226226
/* Check for errors */
227227
if (rcar_pci_read_reg(pcie, PCIEERRFR) & UNSUPPORTED_REQUEST)

drivers/pci/controller/pcie-rcar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#define PCIECAR 0x000010
1313
#define PCIECCTLR 0x000018
14-
#define CONFIG_SEND_ENABLE BIT(31)
14+
#define PCIECCTLR_CCIE BIT(31)
1515
#define TYPE0 (0 << 8)
1616
#define TYPE1 BIT(8)
1717
#define PCIECDR 0x000020

0 commit comments

Comments
 (0)