drm/amd/amdgpu : Remove unused variable

[cascardo/linux.git] / drivers / gpu / drm / amd / amdgpu / iceland_ih.c

diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
index 679e739..3b8906c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
@@ -103,7 +103,6 @@ static void iceland_ih_disable_interrupts(struct amdgpu_device *adev)
  */
 static int iceland_ih_irq_init(struct amdgpu_device *adev)
 {
-       int ret = 0;
        int rb_bufsz;
        u32 interrupt_cntl, ih_cntl, ih_rb_cntl;
        u64 wptr_off;
@@ -157,7 +156,7 @@ static int iceland_ih_irq_init(struct amdgpu_device *adev)
        /* enable interrupts */
        iceland_ih_enable_interrupts(adev);
 
-       return ret;
+       return 0;
 }
 
 /**
@@ -351,35 +350,6 @@ static int iceland_ih_wait_for_idle(void *handle)
        return -ETIMEDOUT;
 }
 
-static void iceland_ih_print_status(void *handle)
-{
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-
-       dev_info(adev->dev, "ICELAND IH registers\n");
-       dev_info(adev->dev, "  SRBM_STATUS=0x%08X\n",
-               RREG32(mmSRBM_STATUS));
-       dev_info(adev->dev, "  SRBM_STATUS2=0x%08X\n",
-               RREG32(mmSRBM_STATUS2));
-       dev_info(adev->dev, "  INTERRUPT_CNTL=0x%08X\n",
-                RREG32(mmINTERRUPT_CNTL));
-       dev_info(adev->dev, "  INTERRUPT_CNTL2=0x%08X\n",
-                RREG32(mmINTERRUPT_CNTL2));
-       dev_info(adev->dev, "  IH_CNTL=0x%08X\n",
-                RREG32(mmIH_CNTL));
-       dev_info(adev->dev, "  IH_RB_CNTL=0x%08X\n",
-                RREG32(mmIH_RB_CNTL));
-       dev_info(adev->dev, "  IH_RB_BASE=0x%08X\n",
-                RREG32(mmIH_RB_BASE));
-       dev_info(adev->dev, "  IH_RB_WPTR_ADDR_LO=0x%08X\n",
-                RREG32(mmIH_RB_WPTR_ADDR_LO));
-       dev_info(adev->dev, "  IH_RB_WPTR_ADDR_HI=0x%08X\n",
-                RREG32(mmIH_RB_WPTR_ADDR_HI));
-       dev_info(adev->dev, "  IH_RB_RPTR=0x%08X\n",
-                RREG32(mmIH_RB_RPTR));
-       dev_info(adev->dev, "  IH_RB_WPTR=0x%08X\n",
-                RREG32(mmIH_RB_WPTR));
-}
-
 static int iceland_ih_soft_reset(void *handle)
 {
        u32 srbm_soft_reset = 0;
@@ -391,8 +361,6 @@ static int iceland_ih_soft_reset(void *handle)
                                                SOFT_RESET_IH, 1);
 
        if (srbm_soft_reset) {
-               iceland_ih_print_status((void *)adev);
-
                tmp = RREG32(mmSRBM_SOFT_RESET);
                tmp |= srbm_soft_reset;
                dev_info(adev->dev, "SRBM_SOFT_RESET=0x%08X\n", tmp);
@@ -407,8 +375,6 @@ static int iceland_ih_soft_reset(void *handle)
 
                /* Wait a little for things to settle down */
                udelay(50);
-
-               iceland_ih_print_status((void *)adev);
        }
 
        return 0;
@@ -427,6 +393,7 @@ static int iceland_ih_set_powergating_state(void *handle,
 }
 
 const struct amd_ip_funcs iceland_ih_ip_funcs = {
+       .name = "iceland_ih",
        .early_init = iceland_ih_early_init,
        .late_init = NULL,
        .sw_init = iceland_ih_sw_init,
@@ -438,7 +405,6 @@ const struct amd_ip_funcs iceland_ih_ip_funcs = {
        .is_idle = iceland_ih_is_idle,
        .wait_for_idle = iceland_ih_wait_for_idle,
        .soft_reset = iceland_ih_soft_reset,
-       .print_status = iceland_ih_print_status,
        .set_clockgating_state = iceland_ih_set_clockgating_state,
        .set_powergating_state = iceland_ih_set_powergating_state,
 };