drm/i915/gmbus: convert to drm_device based logging,

Conversion instances of printk based drm logging macros to use the
struct drm_device based logging macros in i915/display/intel_gmbus.c.
This was done using the following coccinelle semantic patch that
transforms based on the existence of an existing 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,
...)
)
...+>
}

New 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/5964ce0a603e2ec0e6110c927a11234e66891258.1583766715.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
index 0aaaaac44973b3517bd419bc27fa7734b6274ee8..1fd3a5a6296b136f2cab3bf776a4b8ec1e4b3e20 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
@@ -631,8 +631,9 @@ retry:
         * till then let it sleep.
         */
        if (gmbus_wait_idle(dev_priv)) {
-               DRM_DEBUG_KMS("GMBUS [%s] timed out waiting for idle\n",
-                        adapter->name);
+               drm_dbg_kms(&dev_priv->drm,
+                           "GMBUS [%s] timed out waiting for idle\n",
+                           adapter->name);
                ret = -ETIMEDOUT;
        }
        intel_de_write_fw(dev_priv, GMBUS0, 0);
@@ -655,8 +656,9 @@ clear_err:
         */
        ret = -ENXIO;
        if (gmbus_wait_idle(dev_priv)) {
-               DRM_DEBUG_KMS("GMBUS [%s] timed out after NAK\n",
-                             adapter->name);
+               drm_dbg_kms(&dev_priv->drm,
+                           "GMBUS [%s] timed out after NAK\n",
+                           adapter->name);
                ret = -ETIMEDOUT;
        }
 
@@ -668,9 +670,9 @@ clear_err:
        intel_de_write_fw(dev_priv, GMBUS1, 0);
        intel_de_write_fw(dev_priv, GMBUS0, 0);
 
-       DRM_DEBUG_KMS("GMBUS [%s] NAK for addr: %04x %c(%d)\n",
-                        adapter->name, msgs[i].addr,
-                        (msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len);
+       drm_dbg_kms(&dev_priv->drm, "GMBUS [%s] NAK for addr: %04x %c(%d)\n",
+                   adapter->name, msgs[i].addr,
+                   (msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len);
 
        /*
         * Passive adapters sometimes NAK the first probe. Retry the first
@@ -679,16 +681,18 @@ clear_err:
         * drm_do_probe_ddc_edid, which bails out on the first -ENXIO.
         */
        if (ret == -ENXIO && i == 0 && try++ == 0) {
-               DRM_DEBUG_KMS("GMBUS [%s] NAK on first message, retry\n",
-                             adapter->name);
+               drm_dbg_kms(&dev_priv->drm,
+                           "GMBUS [%s] NAK on first message, retry\n",
+                           adapter->name);
                goto retry;
        }
 
        goto out;
 
 timeout:
-       DRM_DEBUG_KMS("GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
-                     bus->adapter.name, bus->reg0 & 0xff);
+       drm_dbg_kms(&dev_priv->drm,
+                   "GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
+                   bus->adapter.name, bus->reg0 & 0xff);
        intel_de_write_fw(dev_priv, GMBUS0, 0);
 
        /*
@@ -925,9 +929,10 @@ void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)
        mutex_lock(&dev_priv->gmbus_mutex);
 
        bus->force_bit += force_bit ? 1 : -1;
-       DRM_DEBUG_KMS("%sabling bit-banging on %s. force bit now %d\n",
-                     force_bit ? "en" : "dis", adapter->name,
-                     bus->force_bit);
+       drm_dbg_kms(&dev_priv->drm,
+                   "%sabling bit-banging on %s. force bit now %d\n",
+                   force_bit ? "en" : "dis", adapter->name,
+                   bus->force_bit);
 
        mutex_unlock(&dev_priv->gmbus_mutex);
 }