drm/i915: remove a few __i915_printk() uses

__i915_printk() does nothing special for notice/info levels. Just use
the regular drm_notice() and drm_info() calls.

Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/82857a0c04d3c11ca6758f05c13a3cec4f1a2f01.1722951405.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
index 6f9e7b354b5441dbe518827ad6e48df99cdbccea..bee32222f0fd9f1d481bc7cdd739947c0fe01240 100644 (file)
--- a/drivers/gpu/drm/i915/i915_utils.c
+++ b/drivers/gpu/drm/i915/i915_utils.c
@@ -54,8 +54,8 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
 
 void add_taint_for_CI(struct drm_i915_private *i915, unsigned int taint)
 {
-       __i915_printk(i915, KERN_NOTICE, "CI tainted:%#x by %pS\n",
-                     taint, (void *)_RET_IP_);
+       drm_notice(&i915->drm, "CI tainted: %#x by %pS\n",
+                  taint, __builtin_return_address(0));
 
        /* Failures that occur during fault injection testing are expected */
        if (!i915_error_injected())
@@ -74,9 +74,9 @@ int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
        if (++i915_probe_fail_count < i915_modparams.inject_probe_failure)
                return 0;
 
-       __i915_printk(i915, KERN_INFO,
-                     "Injecting failure %d at checkpoint %u [%s:%d]\n",
-                     err, i915_modparams.inject_probe_failure, func, line);
+       drm_info(&i915->drm, "Injecting failure %d at checkpoint %u [%s:%d]\n",
+                err, i915_modparams.inject_probe_failure, func, line);
+
        i915_modparams.inject_probe_failure = 0;
        return err;
 }