2020-04-11 14:06:35

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH] drm/amdgpu: Add missing '\n' in log messages

Message logged by 'dev_xxx()' or 'pr_xxx()' should end with a '\n'.

While at it, split some long lines that where not that far.

Signed-off-by: Christophe JAILLET <[email protected]>
---
Most of them have been added in commit bd607166af7f ("drm/amdgpu: Enable reading FRU chip via I2C v3")
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 87f7c129c8ce..3d0a50e8c36b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3249,25 +3249,25 @@ int amdgpu_device_init(struct amdgpu_device *adev,

r = device_create_file(adev->dev, &dev_attr_pcie_replay_count);
if (r) {
- dev_err(adev->dev, "Could not create pcie_replay_count");
+ dev_err(adev->dev, "Could not create pcie_replay_count\n");
return r;
}

r = device_create_file(adev->dev, &dev_attr_product_name);
if (r) {
- dev_err(adev->dev, "Could not create product_name");
+ dev_err(adev->dev, "Could not create product_name\n");
return r;
}

r = device_create_file(adev->dev, &dev_attr_product_number);
if (r) {
- dev_err(adev->dev, "Could not create product_number");
+ dev_err(adev->dev, "Could not create product_number\n");
return r;
}

r = device_create_file(adev->dev, &dev_attr_serial_number);
if (r) {
- dev_err(adev->dev, "Could not create serial_number");
+ dev_err(adev->dev, "Could not create serial_number\n");
return r;
}

@@ -4270,7 +4270,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
job_signaled = true;

if (job_signaled) {
- dev_info(adev->dev, "Guilty job already signaled, skipping HW reset");
+ dev_info(adev->dev, "Guilty job already signaled, skipping HW reset\n");
goto skip_hw_reset;
}

@@ -4339,10 +4339,12 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

if (r) {
/* bad news, how to tell it to userspace ? */
- dev_info(tmp_adev->dev, "GPU reset(%d) failed\n", atomic_read(&tmp_adev->gpu_reset_counter));
+ dev_info(tmp_adev->dev, "GPU reset(%d) failed\n",
+ atomic_read(&tmp_adev->gpu_reset_counter));
amdgpu_vf_error_put(tmp_adev, AMDGIM_ERROR_VF_GPU_RESET_FAIL, 0, r);
} else {
- dev_info(tmp_adev->dev, "GPU reset(%d) succeeded!\n", atomic_read(&tmp_adev->gpu_reset_counter));
+ dev_info(tmp_adev->dev, "GPU reset(%d) succeeded!\n",
+ atomic_read(&tmp_adev->gpu_reset_counter));
}
}

--
2.20.1


2020-04-13 05:46:15

by Evan Quan

[permalink] [raw]
Subject: RE: [PATCH] drm/amdgpu: Add missing '\n' in log messages

Reviewed-by: Evan Quan <[email protected]>

-----Original Message-----
From: Christophe JAILLET <[email protected]>
Sent: Saturday, April 11, 2020 10:04 PM
To: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Zhou, David(ChunMing) <[email protected]>; [email protected]; [email protected]; Zhang, Hawking <[email protected]>; Quan, Evan <[email protected]>; Grodzovsky, Andrey <[email protected]>; Liu, Monk <[email protected]>; Russell, Kent <[email protected]>; Ma, Le <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Christophe JAILLET <[email protected]>
Subject: [PATCH] drm/amdgpu: Add missing '\n' in log messages

Message logged by 'dev_xxx()' or 'pr_xxx()' should end with a '\n'.

While at it, split some long lines that where not that far.

Signed-off-by: Christophe JAILLET <[email protected]>
---
Most of them have been added in commit bd607166af7f ("drm/amdgpu: Enable reading FRU chip via I2C v3")
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 87f7c129c8ce..3d0a50e8c36b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3249,25 +3249,25 @@ int amdgpu_device_init(struct amdgpu_device *adev,

r = device_create_file(adev->dev, &dev_attr_pcie_replay_count);
if (r) {
- dev_err(adev->dev, "Could not create pcie_replay_count");
+ dev_err(adev->dev, "Could not create pcie_replay_count\n");
return r;
}

r = device_create_file(adev->dev, &dev_attr_product_name);
if (r) {
- dev_err(adev->dev, "Could not create product_name");
+ dev_err(adev->dev, "Could not create product_name\n");
return r;
}

r = device_create_file(adev->dev, &dev_attr_product_number);
if (r) {
- dev_err(adev->dev, "Could not create product_number");
+ dev_err(adev->dev, "Could not create product_number\n");
return r;
}

r = device_create_file(adev->dev, &dev_attr_serial_number);
if (r) {
- dev_err(adev->dev, "Could not create serial_number");
+ dev_err(adev->dev, "Could not create serial_number\n");
return r;
}

@@ -4270,7 +4270,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
job_signaled = true;

if (job_signaled) {
- dev_info(adev->dev, "Guilty job already signaled, skipping HW reset");
+ dev_info(adev->dev, "Guilty job already signaled, skipping HW reset\n");
goto skip_hw_reset;
}

@@ -4339,10 +4339,12 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

if (r) {
/* bad news, how to tell it to userspace ? */
- dev_info(tmp_adev->dev, "GPU reset(%d) failed\n", atomic_read(&tmp_adev->gpu_reset_counter));
+ dev_info(tmp_adev->dev, "GPU reset(%d) failed\n",
+ atomic_read(&tmp_adev->gpu_reset_counter));
amdgpu_vf_error_put(tmp_adev, AMDGIM_ERROR_VF_GPU_RESET_FAIL, 0, r);
} else {
- dev_info(tmp_adev->dev, "GPU reset(%d) succeeded!\n", atomic_read(&tmp_adev->gpu_reset_counter));
+ dev_info(tmp_adev->dev, "GPU reset(%d) succeeded!\n",
+ atomic_read(&tmp_adev->gpu_reset_counter));
}
}

--
2.20.1