1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 245a18aeb389..1c006ba9d826 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -101,7 +101,7 @@ static u32 soc15_pcie_rreg(struct amdgpu_device *adev, u32 reg)
 {
         unsigned long flags, address, data;
         u32 r;
-        struct nbio_pcie_index_data *nbio_pcie_id;
+        const struct nbio_pcie_index_data *nbio_pcie_id;
 
         if (adev->flags & AMD_IS_APU)
                 nbio_pcie_id = &nbio_v7_0_pcie_index_data;
@@ -122,7 +122,7 @@ static u32 soc15_pcie_rreg(struct amdgpu_device *adev, u32 reg)
 static void soc15_pcie_wreg(struct amdgpu_device *adev, u32 reg, u32 v)
 {
         unsigned long flags, address, data;
-        struct nbio_pcie_index_data *nbio_pcie_id;
+        const struct nbio_pcie_index_data *nbio_pcie_id;
 
         if (adev->flags & AMD_IS_APU)
                 nbio_pcie_id = &nbio_v7_0_pcie_index_data;
@@ -604,21 +604,6 @@ static int soc15_common_early_init(void *handle)
                 (amdgpu_ip_block_mask & (1 << AMD_IP_BLOCK_TYPE_PSP)))
                 psp_enabled = true;
 
-        /*
-         * nbio need be used for both sdma and gfx9, but only
-         * initializes once
-         */
-        switch(adev->asic_type) {
-        case CHIP_VEGA10:
-                nbio_v6_1_init(adev);
-                break;
-        case CHIP_RAVEN:
-                nbio_v7_0_init(adev);
-                break;
-        default:
-                return -EINVAL;
-        }
-
         adev->rev_id = soc15_get_rev_id(adev);
         adev->external_rev_id = 0xFF;
         switch (adev->asic_type) {