diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2023-04-07 10:52:16 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-04-07 10:52:16 -0500 |
| commit | be829256e322f688098e5d3afba55ea1c0233e18 (patch) | |
| tree | 2a40d3c54dd65c786c5806228ebbd841373724c7 | |
| parent | 5e53784d4e0001b677df6a06bc0228807b16fe0a (diff) | |
| parent | 727de4c0876836fdf59ec13c3121880fc939cc3e (diff) | |
| download | linux-next-be829256e322f688098e5d3afba55ea1c0233e18.tar.gz | |
Merge branch 'pci/controller/rcar'
- Rename internal #defines without "CONFIG_" prefix to avoid confusion
(Lukas Bulwahn)
* pci/controller/rcar:
PCI: rcar: Avoid defines prefixed with CONFIG
| -rw-r--r-- | drivers/pci/controller/pcie-rcar-host.c | 4 | ||||
| -rw-r--r-- | drivers/pci/controller/pcie-rcar.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index e4faf90feaf5..e80e56b2a842 100644 --- a/drivers/pci/controller/pcie-rcar-host.c +++ b/drivers/pci/controller/pcie-rcar-host.c @@ -219,9 +219,9 @@ static int rcar_pcie_config_access(struct rcar_pcie_host *host, /* Enable the configuration access */ if (pci_is_root_bus(bus->parent)) - rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE0, PCIECCTLR); + rcar_pci_write_reg(pcie, PCIECCTLR_CCIE | TYPE0, PCIECCTLR); else - rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE1, PCIECCTLR); + rcar_pci_write_reg(pcie, PCIECCTLR_CCIE | TYPE1, PCIECCTLR); /* Check for errors */ if (rcar_pci_read_reg(pcie, PCIEERRFR) & UNSUPPORTED_REQUEST) diff --git a/drivers/pci/controller/pcie-rcar.h b/drivers/pci/controller/pcie-rcar.h index 9bb125db85c6..6799f81392fc 100644 --- a/drivers/pci/controller/pcie-rcar.h +++ b/drivers/pci/controller/pcie-rcar.h @@ -11,7 +11,7 @@ #define PCIECAR 0x000010 #define PCIECCTLR 0x000018 -#define CONFIG_SEND_ENABLE BIT(31) +#define PCIECCTLR_CCIE BIT(31) #define TYPE0 (0 << 8) #define TYPE1 BIT(8) #define PCIECDR 0x000020 |