Commit 30dc83a9 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 5c5dd883 727de4c0

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/pci/controller/pcie-rcar.h

+1 −1
Original line number Diff line number Diff line
@@ -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