diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-08-13 09:25:04 +0200 |
|---|---|---|
| committer |   Tony Luck <tony.luck@intel.com> | 2019-08-16 11:33:57 -0700 |
| commit | 768557ca5b062e14ccdc55d255f7ff50bb90d40a (patch) | |
| tree | 0517f7ea0e27d83983aa19ddff7a2657f436a809 /arch/ia64/hp | |
| parent | ia64: remove the hpsim platform (diff) | |
| download | linux-dev-768557ca5b062e14ccdc55d255f7ff50bb90d40a.tar.xz linux-dev-768557ca5b062e14ccdc55d255f7ff50bb90d40a.zip | |
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: Tom Vaden <tom.vaden@hpe.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-19-hch@lst.de
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/hp')
| -rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 3d24cc43385b..18321ce8bfa0 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -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)) \ +#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(); |