1 files changed, 2 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index fa2906a103dd..9fecb313a4c9 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -140,7 +140,7 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
         return ret;
 }
 
-static DEFINE_PER_CPU(u64 *, tce_page) = NULL;
+static DEFINE_PER_CPU(u64 *, tce_page);
 
 static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
                                      long npages, unsigned long uaddr,
@@ -589,13 +589,8 @@ static struct notifier_block iommu_reconfig_nb = {
 /* These are called very early. */
 void iommu_init_early_pSeries(void)
 {
-        if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL)) {
-                /* Direct I/O, IOMMU off */
-                ppc_md.pci_dma_dev_setup = NULL;
-                ppc_md.pci_dma_bus_setup = NULL;
-                set_pci_dma_ops(&dma_direct_ops);
+        if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL))
                 return;
-        }
 
         if (firmware_has_feature(FW_FEATURE_LPAR)) {
                 if (firmware_has_feature(FW_FEATURE_MULTITCE)) {