Commit a67e75be authored by Pratap Nirujogi's avatar Pratap Nirujogi Committed by Alex Deucher
Browse files

drm/amdgpu: Replace DRM_ERROR() with drm_err() 



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

Signed-off-by: default avatarPratap Nirujogi <pratap.nirujogi@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b5838d15

drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c

+10 −5
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c

+10 −5
Original line number Diff line number Diff line
@@ -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;

	}