Commit 768557ca authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

ia64: remove CONFIG_PCI ifdefs 



Now that hpsim support is gone, CONFIG_PCI is forced on for ia64, and
we can remove a few ifdefs for it.

Acked-by: default avatarTom Vaden <tom.vaden@hpe.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-19-hch@lst.de


Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent fc5bad03

arch/ia64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ 
core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/

core-$(CONFIG_IA64_SGI_UV)	+= arch/ia64/uv/



drivers-$(CONFIG_PCI)		+= arch/ia64/pci/

drivers-y			+= arch/ia64/pci/

drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/

arch/ia64/hp/common/sba_iommu.c

+1 −9
Original line number Diff line number Diff line
@@ -251,12 +251,8 @@ static SBA_INLINE void sba_free_range(struct ioc *, dma_addr_t, size_t); 
static u64 prefetch_spill_page;

#endif



#ifdef CONFIG_PCI

#define GET_IOC(dev)	((dev_is_pci(dev))						\

			 ? ((struct ioc *) PCI_CONTROLLER(to_pci_dev(dev))->iommu) : NULL)

#else

# define GET_IOC(dev)	NULL

#endif



/*

** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up
@@ -1741,9 +1737,7 @@ ioc_sac_init(struct ioc *ioc) 
	controller->iommu = ioc;

	sac->sysdata = controller;

	sac->dma_mask = 0xFFFFFFFFUL;

#ifdef CONFIG_PCI

	sac->dev.bus = &pci_bus_type;

#endif

	ioc->sac_only_dev = sac;

}
@@ -2121,13 +2115,11 @@ sba_init(void) 
	}

#endif



#ifdef CONFIG_PCI

	{

		struct pci_bus *b = NULL;

		while ((b = pci_find_next_bus(b)) != NULL)

			sba_connect_bus(b);

	}

#endif



#ifdef CONFIG_PROC_FS

	ioc_proc_init();

arch/ia64/include/asm/dma.h

+1 −5
Original line number Diff line number Diff line
@@ -12,11 +12,7 @@ 


extern unsigned long MAX_DMA_ADDRESS;



#ifdef CONFIG_PCI

extern int isa_dma_bridge_buggy;

#else

# define isa_dma_bridge_buggy 	(0)

#endif



#define free_dma(x)

arch/ia64/kernel/sys_ia64.c

+0 −18
Original line number Diff line number Diff line
@@ -166,21 +166,3 @@ ia64_mremap (unsigned long addr, unsigned long old_len, unsigned long new_len, u 
		force_successful_syscall_return();

	return addr;

}
 


#ifndef CONFIG_PCI



asmlinkage long

sys_pciconfig_read (unsigned long bus, unsigned long dfn, unsigned long off, unsigned long len,

		    void *buf)

{

	return -ENOSYS;

}



asmlinkage long

sys_pciconfig_write (unsigned long bus, unsigned long dfn, unsigned long off, unsigned long len,

		     void *buf)

{

	return -ENOSYS;

}



#endif /* CONFIG_PCI */

arch/ia64/mm/init.c

+0 −2
Original line number Diff line number Diff line
@@ -632,14 +632,12 @@ mem_init (void) 
	BUG_ON(PTRS_PER_PMD * sizeof(pmd_t) != PAGE_SIZE);

	BUG_ON(PTRS_PER_PTE * sizeof(pte_t) != PAGE_SIZE);



#ifdef CONFIG_PCI

	/*

	 * This needs to be called _after_ the command line has been parsed but _before_

	 * any drivers that may need the PCI DMA interface are initialized or bootmem has

	 * been freed.

	 */

	platform_dma_init();

#endif



#ifdef CONFIG_FLATMEM

	BUG_ON(!mem_map);

CRA Git | Maintained and supported by SUSTech CRA and CCSE