drm/amdgpu: simplify the access to eeprom_control struct
authorTao Zhou <tao.zhou1@amd.com>
Wed, 18 Sep 2019 07:26:23 +0000 (15:26 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 3 Oct 2019 14:11:02 +0000 (09:11 -0500)
simplify the code of accessing to eeprom_control struct

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

index 00cd01c616682335c670f593231af72c3983b0fe..486568ded6d6a72b542f03ba67aa1d602b0e8bcc 100644 (file)
@@ -1386,7 +1386,7 @@ static int amdgpu_ras_save_bad_pages(struct amdgpu_device *adev)
        save_count = data->count - control->num_recs;
        /* only new entries are saved */
        if (save_count > 0)
-               if (amdgpu_ras_eeprom_process_recods(&con->eeprom_control,
+               if (amdgpu_ras_eeprom_process_recods(control,
                                                        &data->bps[control->num_recs],
                                                        true,
                                                        save_count)) {
@@ -1524,11 +1524,11 @@ int amdgpu_ras_recovery_init(struct amdgpu_device *adev)
        atomic_set(&con->in_recovery, 0);
        con->adev = adev;
 
-       ret = amdgpu_ras_eeprom_init(&adev->psp.ras.ras->eeprom_control);
+       ret = amdgpu_ras_eeprom_init(&con->eeprom_control);
        if (ret)
                goto free;
 
-       if (adev->psp.ras.ras->eeprom_control.num_recs) {
+       if (con->eeprom_control.num_recs) {
                ret = amdgpu_ras_load_bad_pages(adev);
                if (ret)
                        goto free;