drm/i915/uc: prefer struct drm_device based logging

Prefer struct drm_device based logging over struct device based logging.

No functional changes.

Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200402114819.17232-10-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index b11e564ef22e0c92c9d7a06a9c87cc5b16de5ee0..4681cdd24da47ae1a78286269193f9089687fb34 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -45,12 +45,12 @@ static void __confirm_options(struct intel_uc *uc)
 {
        struct drm_i915_private *i915 = uc_to_gt(uc)->i915;
 
-       DRM_DEV_DEBUG_DRIVER(i915->drm.dev,
-                            "enable_guc=%d (guc:%s submission:%s huc:%s)\n",
-                            i915_modparams.enable_guc,
-                            yesno(intel_uc_wants_guc(uc)),
-                            yesno(intel_uc_wants_guc_submission(uc)),
-                            yesno(intel_uc_wants_huc(uc)));
+       drm_dbg(&i915->drm,
+               "enable_guc=%d (guc:%s submission:%s huc:%s)\n",
+               i915_modparams.enable_guc,
+               yesno(intel_uc_wants_guc(uc)),
+               yesno(intel_uc_wants_guc_submission(uc)),
+               yesno(intel_uc_wants_huc(uc)));
 
        if (i915_modparams.enable_guc == -1)
                return;

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 1f5d25f1534062b700d274ce88912da85670aa36..fd9e1a3b40737a0c5e17eeafee99f6f581bc1095 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -32,11 +32,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
                               enum intel_uc_fw_status status)
 {
        uc_fw->__status =  status;
-       DRM_DEV_DEBUG_DRIVER(__uc_fw_to_gt(uc_fw)->i915->drm.dev,
-                            "%s firmware -> %s\n",
-                            intel_uc_fw_type_repr(uc_fw->type),
-                            status == INTEL_UC_FIRMWARE_SELECTED ?
-                            uc_fw->path : intel_uc_fw_status_repr(status));
+       drm_dbg(&__uc_fw_to_gt(uc_fw)->i915->drm,
+               "%s firmware -> %s\n",
+               intel_uc_fw_type_repr(uc_fw->type),
+               status == INTEL_UC_FIRMWARE_SELECTED ?
+               uc_fw->path : intel_uc_fw_status_repr(status));
 }
 #endif