drm/i915/tc: automatic conversion to drm_device based logging macros.

Converts most uses of the printk based logging macros to the struct
drm_device based logging macros in i915/display/intel_tc.c using the
following coccinelle script that matches based on the existence of a
struct drm_i915_private device:
@@
identifier fn, T;
@@

fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

@@
identifier fn, T;
@@

fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

Checkpatch warnings were addressed manually.

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

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index c47f3a1fa73d5589df025c54ad39a2e056f061ea..9b850c11aa78b95ee9f68fb681f3d1f5d0e47e98 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -182,8 +182,9 @@ static u32 tc_port_live_status_mask(struct intel_digital_port *dig_port)
                                PORT_TX_DFLEXDPSP(dig_port->tc_phy_fia));
 
        if (val == 0xffffffff) {
-               DRM_DEBUG_KMS("Port %s: PHY in TCCOLD, nothing connected\n",
-                             dig_port->tc_port_name);
+               drm_dbg_kms(&i915->drm,
+                           "Port %s: PHY in TCCOLD, nothing connected\n",
+                           dig_port->tc_port_name);
                return mask;
        }
 
@@ -211,8 +212,9 @@ static bool icl_tc_phy_status_complete(struct intel_digital_port *dig_port)
        val = intel_uncore_read(uncore,
                                PORT_TX_DFLEXDPPMS(dig_port->tc_phy_fia));
        if (val == 0xffffffff) {
-               DRM_DEBUG_KMS("Port %s: PHY in TCCOLD, assuming not complete\n",
-                             dig_port->tc_port_name);
+               drm_dbg_kms(&i915->drm,
+                           "Port %s: PHY in TCCOLD, assuming not complete\n",
+                           dig_port->tc_port_name);
                return false;
        }
 
@@ -229,8 +231,9 @@ static bool icl_tc_phy_set_safe_mode(struct intel_digital_port *dig_port,
        val = intel_uncore_read(uncore,
                                PORT_TX_DFLEXDPCSSS(dig_port->tc_phy_fia));
        if (val == 0xffffffff) {
-               DRM_DEBUG_KMS("Port %s: PHY in TCCOLD, can't set safe-mode to %s\n",
-                             dig_port->tc_port_name,
+               drm_dbg_kms(&i915->drm,
+                           "Port %s: PHY in TCCOLD, can't set safe-mode to %s\n",
+                           dig_port->tc_port_name,
                              enableddisabled(enable));
 
                return false;
@@ -244,8 +247,9 @@ static bool icl_tc_phy_set_safe_mode(struct intel_digital_port *dig_port,
                           PORT_TX_DFLEXDPCSSS(dig_port->tc_phy_fia), val);
 
        if (enable && wait_for(!icl_tc_phy_status_complete(dig_port), 10))
-               DRM_DEBUG_KMS("Port %s: PHY complete clear timed out\n",
-                             dig_port->tc_port_name);
+               drm_dbg_kms(&i915->drm,
+                           "Port %s: PHY complete clear timed out\n",
+                           dig_port->tc_port_name);
 
        return true;
 }
@@ -259,8 +263,9 @@ static bool icl_tc_phy_is_in_safe_mode(struct intel_digital_port *dig_port)
        val = intel_uncore_read(uncore,
                                PORT_TX_DFLEXDPCSSS(dig_port->tc_phy_fia));
        if (val == 0xffffffff) {
-               DRM_DEBUG_KMS("Port %s: PHY in TCCOLD, assume safe mode\n",
-                             dig_port->tc_port_name);
+               drm_dbg_kms(&i915->drm,
+                           "Port %s: PHY in TCCOLD, assume safe mode\n",
+                           dig_port->tc_port_name);
                return true;
        }
 
@@ -417,10 +422,10 @@ static void intel_tc_port_reset_mode(struct intel_digital_port *dig_port,
        icl_tc_phy_disconnect(dig_port);
        icl_tc_phy_connect(dig_port, required_lanes);
 
-       DRM_DEBUG_KMS("Port %s: TC port mode reset (%s -> %s)\n",
-                     dig_port->tc_port_name,
-                     tc_port_mode_name(old_tc_mode),
-                     tc_port_mode_name(dig_port->tc_mode));
+       drm_dbg_kms(&i915->drm, "Port %s: TC port mode reset (%s -> %s)\n",
+                   dig_port->tc_port_name,
+                   tc_port_mode_name(old_tc_mode),
+                   tc_port_mode_name(dig_port->tc_mode));
 }
 
 static void