drm/i915/dpio_phy: convert to drm_device based logging macros.

Conversion of the printk based logging macros to the struct drm_device
based logging macros in i915/display/intel_dpio_phy.c.
This was achieved using the following coccinelle semantic patch that
matches based on the existence of a 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_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&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_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

Note that this converts both DRM_DEBUG/DRM_DEBUG_DRIVER to drm_dbg().
Checkpatch warnings were fixed manually.

References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
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/20200206080014.13759-13-wambui.karugax@gmail.com

diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
index 85d6471ac357d9481164c0a1d8bd52be967e2173..399a7edb456876a36d9fbeaa542edaf7173c3e58 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpio_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
@@ -294,7 +294,8 @@ void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
                val |= SCALE_DCOMP_METHOD;
 
        if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD))
-               DRM_ERROR("Disabled scaling while ouniqetrangenmethod was set");
+               drm_err(&dev_priv->drm,
+                       "Disabled scaling while ouniqetrangenmethod was set");
 
        intel_de_write(dev_priv, BXT_PORT_TX_DW3_GRP(phy, ch), val);
 
@@ -320,15 +321,15 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
 
        if ((intel_de_read(dev_priv, BXT_PORT_CL1CM_DW0(phy)) &
             (PHY_POWER_GOOD | PHY_RESERVED)) != PHY_POWER_GOOD) {
-               DRM_DEBUG_DRIVER("DDI PHY %d powered, but power hasn't settled\n",
-                                phy);
+               drm_dbg(&dev_priv->drm,
+                       "DDI PHY %d powered, but power hasn't settled\n", phy);
 
                return false;
        }
 
        if (!(intel_de_read(dev_priv, BXT_PHY_CTL_FAMILY(phy)) & COMMON_RESET_DIS)) {
-               DRM_DEBUG_DRIVER("DDI PHY %d powered, but still in reset\n",
-                                phy);
+               drm_dbg(&dev_priv->drm,
+                       "DDI PHY %d powered, but still in reset\n", phy);
 
                return false;
        }
@@ -348,7 +349,8 @@ static void bxt_phy_wait_grc_done(struct drm_i915_private *dev_priv,
 {
        if (intel_de_wait_for_set(dev_priv, BXT_PORT_REF_DW3(phy),
                                  GRC_DONE, 10))
-               DRM_ERROR("timeout waiting for PHY%d GRC\n", phy);
+               drm_err(&dev_priv->drm, "timeout waiting for PHY%d GRC\n",
+                       phy);
 }
 
 static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv,
@@ -365,13 +367,14 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv,
                        dev_priv->bxt_phy_grc = bxt_get_grc(dev_priv, phy);
 
                if (bxt_ddi_phy_verify_state(dev_priv, phy)) {
-                       DRM_DEBUG_DRIVER("DDI PHY %d already enabled, "
-                                        "won't reprogram it\n", phy);
+                       drm_dbg(&dev_priv->drm, "DDI PHY %d already enabled, "
+                               "won't reprogram it\n", phy);
                        return;
                }
 
-               DRM_DEBUG_DRIVER("DDI PHY %d enabled with invalid state, "
-                                "force reprogramming it\n", phy);
+               drm_dbg(&dev_priv->drm,
+                       "DDI PHY %d enabled with invalid state, "
+                       "force reprogramming it\n", phy);
        }
 
        val = intel_de_read(dev_priv, BXT_P_CR_GT_DISP_PWRON);
@@ -391,7 +394,8 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv,
                                       PHY_RESERVED | PHY_POWER_GOOD,
                                       PHY_POWER_GOOD,
                                       1))
-               DRM_ERROR("timeout during PHY%d power on\n", phy);
+               drm_err(&dev_priv->drm, "timeout during PHY%d power on\n",
+                       phy);
 
        /* Program PLL Rcomp code offset */
        val = intel_de_read(dev_priv, BXT_PORT_CL1CM_DW9(phy));
@@ -505,7 +509,7 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,
        vaf.fmt = reg_fmt;
        vaf.va = &args;
 
-       DRM_DEBUG_DRIVER("DDI PHY %d reg %pV [%08x] state mismatch: "
+       drm_dbg(&dev_priv->drm, "DDI PHY %d reg %pV [%08x] state mismatch: "
                         "current %08x, expected %08x (mask %08x)\n",
                         phy, &vaf, reg.reg, val, (val & ~mask) | expected,
                         mask);