[PATCH 1/2] drm/amdgpu: Replace DRM_ERROR() with drm_err()

[Pratap Nirujogi]

DRM_ERROR() is no longer preferred. Replace DRM_ERROR() usage
with drm_err() in isp driver.

Signed-off-by: Pratap Nirujogi <pratap.niruj...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c | 15 ++++++++++-----
 drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c 
b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c
index 964c29ef25dc..2475564b2c08 100644
--- a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c
@@ -53,7 +53,8 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
        isp->isp_cell = kcalloc(2, sizeof(struct mfd_cell), GFP_KERNEL);
        if (!isp->isp_cell) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp mfd cell alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp mfd cell alloc failed\n", __func__);
                goto failure;
        }
 
@@ -62,14 +63,16 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
                               GFP_KERNEL);
        if (!isp->isp_res) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp mfd res alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp mfd res alloc failed\n", __func__);
                goto failure;
        }
 
        isp->isp_pdata = kzalloc(sizeof(*isp->isp_pdata), GFP_KERNEL);
        if (!isp->isp_pdata) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp platform data alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp platform data alloc failed\n", __func__);
                goto failure;
        }
 
@@ -114,7 +117,8 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
                                   GFP_KERNEL);
        if (!isp->isp_i2c_res) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp mfd res alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp mfd res alloc failed\n", __func__);
                goto failure;
        }
 
@@ -131,7 +135,8 @@ static int isp_v4_1_0_hw_init(struct amdgpu_isp *isp)
 
        r = mfd_add_hotplug_devices(isp->parent, isp->isp_cell, 2);
        if (r) {
-               DRM_ERROR("%s: add mfd hotplug device failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: add mfd hotplug device failed\n", __func__);
                goto failure;
        }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c 
b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c
index b56f27295468..3ee5942bc24d 100644
--- a/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c
@@ -53,7 +53,8 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
        isp->isp_cell = kcalloc(2, sizeof(struct mfd_cell), GFP_KERNEL);
        if (!isp->isp_cell) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp mfd cell alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp mfd cell alloc failed\n", __func__);
                goto failure;
        }
 
@@ -63,14 +64,16 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
                               GFP_KERNEL);
        if (!isp->isp_res) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp mfd res alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp mfd res alloc failed\n", __func__);
                goto failure;
        }
 
        isp->isp_pdata = kzalloc(sizeof(*isp->isp_pdata), GFP_KERNEL);
        if (!isp->isp_pdata) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp platform data alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp platform data alloc failed\n", __func__);
                goto failure;
        }
 
@@ -114,7 +117,8 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
        isp->isp_i2c_res = kcalloc(1, sizeof(struct resource), GFP_KERNEL);
        if (!isp->isp_i2c_res) {
                r = -ENOMEM;
-               DRM_ERROR("%s: isp mfd res alloc failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: isp mfd res alloc failed\n", __func__);
                goto failure;
        }
 
@@ -131,7 +135,8 @@ static int isp_v4_1_1_hw_init(struct amdgpu_isp *isp)
 
        r = mfd_add_hotplug_devices(isp->parent, isp->isp_cell, 2);
        if (r) {
-               DRM_ERROR("%s: add mfd hotplug device failed\n", __func__);
+               drm_err(&adev->ddev,
+                       "%s: add mfd hotplug device failed\n", __func__);
                goto failure;
        }
 
-- 
2.43.0