diff options
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
-rw-r--r-- | drivers/iommu/amd_iommu_init.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index dbda9ae68c5d..a24495eb4e26 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c | |||
@@ -2026,14 +2026,6 @@ static bool detect_ivrs(void) | |||
2026 | return true; | 2026 | return true; |
2027 | } | 2027 | } |
2028 | 2028 | ||
2029 | static int amd_iommu_init_dma(void) | ||
2030 | { | ||
2031 | if (iommu_pass_through) | ||
2032 | return amd_iommu_init_passthrough(); | ||
2033 | else | ||
2034 | return amd_iommu_init_dma_ops(); | ||
2035 | } | ||
2036 | |||
2037 | /**************************************************************************** | 2029 | /**************************************************************************** |
2038 | * | 2030 | * |
2039 | * AMD IOMMU Initialization State Machine | 2031 | * AMD IOMMU Initialization State Machine |
@@ -2073,7 +2065,7 @@ static int __init state_next(void) | |||
2073 | init_state = ret ? IOMMU_INIT_ERROR : IOMMU_INTERRUPTS_EN; | 2065 | init_state = ret ? IOMMU_INIT_ERROR : IOMMU_INTERRUPTS_EN; |
2074 | break; | 2066 | break; |
2075 | case IOMMU_INTERRUPTS_EN: | 2067 | case IOMMU_INTERRUPTS_EN: |
2076 | ret = amd_iommu_init_dma(); | 2068 | ret = amd_iommu_init_dma_ops(); |
2077 | init_state = ret ? IOMMU_INIT_ERROR : IOMMU_DMA_OPS; | 2069 | init_state = ret ? IOMMU_INIT_ERROR : IOMMU_DMA_OPS; |
2078 | break; | 2070 | break; |
2079 | case IOMMU_DMA_OPS: | 2071 | case IOMMU_DMA_OPS: |