drm/amdgpu: remove the adev check for NULL

adev is a global data structure and isn't expected
to be NULL and hence removing the redundant adev
check from the devcoredump code.

Cc: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Suggested-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
index 1434e9a5506b54ccd0d1049733ea561aba5557a6..3398f2a368d5851038fa98f93f768a65ebb7bcf3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
@@ -211,7 +211,8 @@ amdgpu_devcoredump_read(char *buffer, loff_t offset, size_t count,
        struct drm_printer p;
        struct amdgpu_coredump_info *coredump = data;
        struct drm_print_iterator iter;
-       int i;
+       struct amdgpu_vm_fault_info *fault_info;
+       int i, ver;
 
        iter.data = buffer;
        iter.offset = 0;
@@ -233,26 +234,22 @@ amdgpu_devcoredump_read(char *buffer, loff_t offset, size_t count,
                           coredump->reset_task_info.pid);
 
        /* GPU IP's information of the SOC */
-       if (coredump->adev) {
-               drm_printf(&p, "\nIP Information\n");
-               drm_printf(&p, "SOC Family: %d\n", coredump->adev->family);
-               drm_printf(&p, "SOC Revision id: %d\n", coredump->adev->rev_id);
-               drm_printf(&p, "SOC External Revision id: %d\n",
-                          coredump->adev->external_rev_id);
-
-               for (int i = 1; i < MAX_HWIP; i++) {
-                       for (int j = 0; j < HWIP_MAX_INSTANCE; j++) {
-                               int ver = coredump->adev->ip_versions[i][j];
-
-                               if (ver)
-                                       drm_printf(&p, "HWIP: %s[%d][%d]: v%d.%d.%d.%d.%d\n",
-                                                  hw_ip_names[i], i, j,
-                                                  IP_VERSION_MAJ(ver),
-                                                  IP_VERSION_MIN(ver),
-                                                  IP_VERSION_REV(ver),
-                                                  IP_VERSION_VARIANT(ver),
-                                                  IP_VERSION_SUBREV(ver));
-                       }
+       drm_printf(&p, "\nIP Information\n");
+       drm_printf(&p, "SOC Family: %d\n", coredump->adev->family);
+       drm_printf(&p, "SOC Revision id: %d\n", coredump->adev->rev_id);
+       drm_printf(&p, "SOC External Revision id: %d\n", coredump->adev->external_rev_id);
+
+       for (int i = 1; i < MAX_HWIP; i++) {
+               for (int j = 0; j < HWIP_MAX_INSTANCE; j++) {
+                       ver = coredump->adev->ip_versions[i][j];
+                       if (ver)
+                               drm_printf(&p, "HWIP: %s[%d][%d]: v%d.%d.%d.%d.%d\n",
+                                          hw_ip_names[i], i, j,
+                                          IP_VERSION_MAJ(ver),
+                                          IP_VERSION_MIN(ver),
+                                          IP_VERSION_REV(ver),
+                                          IP_VERSION_VARIANT(ver),
+                                          IP_VERSION_SUBREV(ver));
                }
        }
 
@@ -263,18 +260,14 @@ amdgpu_devcoredump_read(char *buffer, loff_t offset, size_t count,
                           coredump->ring->name);
        }
 
-       if (coredump->adev) {
-               struct amdgpu_vm_fault_info *fault_info =
-                       &coredump->adev->vm_manager.fault_info;
-
-               drm_printf(&p, "\n[%s] Page fault observed\n",
-                          fault_info->vmhub ? "mmhub" : "gfxhub");
-               drm_printf(&p, "Faulty page starting at address: 0x%016llx\n",
-                          fault_info->addr);
-               drm_printf(&p, "Protection fault status register: 0x%x\n\n",
-                          fault_info->status);
-       }
+       /* Add page fault information */
+       fault_info = &coredump->adev->vm_manager.fault_info;
+       drm_printf(&p, "\n[%s] Page fault observed\n",
+                  fault_info->vmhub ? "mmhub" : "gfxhub");
+       drm_printf(&p, "Faulty page starting at address: 0x%016llx\n", fault_info->addr);
+       drm_printf(&p, "Protection fault status register: 0x%x\n\n", fault_info->status);
 
+       /* Add ring buffer information */
        drm_printf(&p, "Ring buffer information\n");
        for (int i = 0; i < coredump->adev->num_rings; i++) {
                int j = 0;