Commit 8e639079 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

PCI: remove CONFIG_PCI_BUS_ADDR_T_64BIT 



This symbol is now always identical to CONFIG_ARCH_DMA_ADDR_T_64BIT, so
remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 4965a687

drivers/pci/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ 


source "drivers/pci/pcie/Kconfig"



config PCI_BUS_ADDR_T_64BIT

	def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT)

	depends on PCI



config PCI_MSI

	bool "Message Signaled Interrupts (MSI and MSI-X)"

	depends on PCI

drivers/pci/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int devm_request_pci_bus_resources(struct device *dev, 
EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources);



static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL};

#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

static struct pci_bus_region pci_64_bit = {0,

				(pci_bus_addr_t) 0xffffffffffffffffULL};

static struct pci_bus_region pci_high = {(pci_bus_addr_t) 0x100000000ULL,
@@ -230,7 +230,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, 
					  resource_size_t),

		void *alignf_data)

{

#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

	int rc;



	if (res->flags & IORESOURCE_MEM_64) {

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, 
int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn,

		  int reg, int len, u32 val);



#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

typedef u64 pci_bus_addr_t;

#else

typedef u32 pci_bus_addr_t;