From: Tao Zhou Date: Wed, 18 Sep 2019 07:26:23 +0000 (+0800) Subject: drm/amdgpu: simplify the access to eeprom_control struct X-Git-Tag: v5.5-rc1~128^2~26^2~93 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0771b0bf0790295b141cc30644a1b0b3e22a331e;p=linux.git drm/amdgpu: simplify the access to eeprom_control struct simplify the code of accessing to eeprom_control struct Signed-off-by: Tao Zhou Reviewed-by: Guchun Chen Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 00cd01c61668..486568ded6d6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -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;