drm/amd/display: Drop unnecessary `amdgpu` prefix

[Why]
The `drm_*()` print macros will handle including the driver in the print
already.  The extra print of the word `amdgpu` is unnecessary.

[How]
Modify all prints to drop `amdgpu: `.

Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Wayne Lin <wayne.lin@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 10d5240dfb6826d91f80db8bd1a0276401e1e5a2..9a7c5a038e37e79bb5257dd8a9d50ac9f4565a63 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1847,7 +1847,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
        mutex_init(&adev->dm.audio_lock);
 
        if (amdgpu_dm_irq_init(adev)) {
-               drm_err(adev_to_drm(adev), "amdgpu: failed to initialize DM IRQ support.\n");
+               drm_err(adev_to_drm(adev), "failed to initialize DM IRQ support.\n");
                goto error;
        }
 
@@ -2037,7 +2037,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 
        adev->dm.hpd_rx_offload_wq = hpd_rx_irq_create_workqueue(adev);
        if (!adev->dm.hpd_rx_offload_wq) {
-               drm_err(adev_to_drm(adev), "amdgpu: failed to create hpd rx offload workqueue.\n");
+               drm_err(adev_to_drm(adev), "failed to create hpd rx offload workqueue.\n");
                goto error;
        }
 
@@ -2053,7 +2053,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
        adev->dm.freesync_module = mod_freesync_create(adev->dm.dc);
        if (!adev->dm.freesync_module) {
                drm_err(adev_to_drm(adev),
-               "amdgpu: failed to initialize freesync_module.\n");
+               "failed to initialize freesync_module.\n");
        } else
                drm_dbg_driver(adev_to_drm(adev), "amdgpu: freesync_module init done %p.\n",
                                adev->dm.freesync_module);
@@ -2064,7 +2064,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
                adev->dm.vblank_control_workqueue =
                        create_singlethread_workqueue("dm_vblank_control_workqueue");
                if (!adev->dm.vblank_control_workqueue)
-                       drm_err(adev_to_drm(adev), "amdgpu: failed to initialize vblank_workqueue.\n");
+                       drm_err(adev_to_drm(adev), "failed to initialize vblank_workqueue.\n");
        }
 
        if (adev->dm.dc->caps.ips_support &&
@@ -2075,7 +2075,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
                adev->dm.hdcp_workqueue = hdcp_create_workqueue(adev, &init_params.cp_psp, adev->dm.dc);
 
                if (!adev->dm.hdcp_workqueue)
-                       drm_err(adev_to_drm(adev), "amdgpu: failed to initialize hdcp_workqueue.\n");
+                       drm_err(adev_to_drm(adev), "failed to initialize hdcp_workqueue.\n");
                else
                        drm_dbg_driver(adev_to_drm(adev), "amdgpu: hdcp_workqueue init done %p.\n", adev->dm.hdcp_workqueue);
 
@@ -2085,20 +2085,20 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
                init_completion(&adev->dm.dmub_aux_transfer_done);
                adev->dm.dmub_notify = kzalloc(sizeof(struct dmub_notification), GFP_KERNEL);
                if (!adev->dm.dmub_notify) {
-                       drm_info(adev_to_drm(adev), "amdgpu: fail to allocate adev->dm.dmub_notify");
+                       drm_info(adev_to_drm(adev), "fail to allocate adev->dm.dmub_notify");
                        goto error;
                }
 
                adev->dm.delayed_hpd_wq = create_singlethread_workqueue("amdgpu_dm_hpd_wq");
                if (!adev->dm.delayed_hpd_wq) {
-                       drm_err(adev_to_drm(adev), "amdgpu: failed to create hpd offload workqueue.\n");
+                       drm_err(adev_to_drm(adev), "failed to create hpd offload workqueue.\n");
                        goto error;
                }
 
                amdgpu_dm_outbox_init(adev);
                if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_AUX_REPLY,
                        dmub_aux_setconfig_callback, false)) {
-                       drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub aux callback");
+                       drm_err(adev_to_drm(adev), "fail to register dmub aux callback");
                        goto error;
                }
 
@@ -2107,7 +2107,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 
                if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_FUSED_IO,
                        dmub_aux_fused_io_callback, false)) {
-                       drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub fused io callback");
+                       drm_err(adev_to_drm(adev), "fail to register dmub fused io callback");
                        goto error;
                }
                /* Enable outbox notification only after IRQ handlers are registered and DMUB is alive.
@@ -2125,7 +2125,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 
        if (amdgpu_dm_initialize_drm_device(adev)) {
                drm_err(adev_to_drm(adev),
-               "amdgpu: failed to initialize sw for display support.\n");
+               "failed to initialize sw for display support.\n");
                goto error;
        }
 
@@ -2140,14 +2140,14 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 
        if (drm_vblank_init(adev_to_drm(adev), adev->dm.display_indexes_num)) {
                drm_err(adev_to_drm(adev),
-               "amdgpu: failed to initialize sw for display support.\n");
+               "failed to initialize sw for display support.\n");
                goto error;
        }
 
 #if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
        amdgpu_dm_crtc_secure_display_create_contexts(adev);
        if (!adev->dm.secure_display_ctx.crtc_ctx)
-               drm_err(adev_to_drm(adev), "amdgpu: failed to initialize secure display contexts.\n");
+               drm_err(adev_to_drm(adev), "failed to initialize secure display contexts.\n");
 
        if (amdgpu_ip_version(adev, DCE_HWIP, 0) >= IP_VERSION(4, 0, 1))
                adev->dm.secure_display_ctx.support_mul_roi = true;
@@ -2571,7 +2571,7 @@ static int dm_sw_init(struct amdgpu_ip_block *ip_block)
        adev->dm.cgs_device = amdgpu_cgs_create_device(adev);
 
        if (!adev->dm.cgs_device) {
-               drm_err(adev_to_drm(adev), "amdgpu: failed to create cgs device.\n");
+               drm_err(adev_to_drm(adev), "failed to create cgs device.\n");
                return -EINVAL;
        }
 
@@ -4002,19 +4002,19 @@ static int register_hpd_handlers(struct amdgpu_device *adev)
        if (dc_is_dmub_outbox_supported(adev->dm.dc)) {
                if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD,
                        dmub_hpd_callback, true)) {
-                       drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd callback");
+                       drm_err(adev_to_drm(adev), "fail to register dmub hpd callback");
                        return -EINVAL;
                }
 
                if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD_IRQ,
                        dmub_hpd_callback, true)) {
-                       drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd callback");
+                       drm_err(adev_to_drm(adev), "fail to register dmub hpd callback");
                        return -EINVAL;
                }
 
                if (!register_dmub_notify_callback(adev, DMUB_NOTIFICATION_HPD_SENSE_NOTIFY,
                        dmub_hpd_sense_callback, true)) {
-                       drm_err(adev_to_drm(adev), "amdgpu: fail to register dmub hpd sense callback");
+                       drm_err(adev_to_drm(adev), "fail to register dmub hpd sense callback");
                        return -EINVAL;
                }
        }

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 25e8befbcc479a3d70cf6239838acacf3cb99134..7187d5aedf0a501256b9e2316890b6d639338efb 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -107,7 +107,7 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
        if (payload.write && result >= 0) {
                if (result) {
                        /*one byte indicating partially written bytes*/
-                       drm_dbg_dp(adev_to_drm(adev), "amdgpu: AUX partially written\n");
+                       drm_dbg_dp(adev_to_drm(adev), "AUX partially written\n");
                        result = payload.data[0];
                } else if (!payload.reply[0])
                        /*I2C_ACK|AUX_ACK*/
@@ -133,11 +133,11 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
                        break;
                }
 
-               drm_dbg_dp(adev_to_drm(adev), "amdgpu: DP AUX transfer fail:%d\n", operation_result);
+               drm_dbg_dp(adev_to_drm(adev), "DP AUX transfer fail:%d\n", operation_result);
        }
 
        if (payload.reply[0])
-               drm_dbg_dp(adev_to_drm(adev), "amdgpu: AUX reply command not ACK: 0x%02x.",
+               drm_dbg_dp(adev_to_drm(adev), "AUX reply command not ACK: 0x%02x.",
                        payload.reply[0]);
 
        return result;