[PATCH 4/6] drm/modes: switch to drm device based error logging

[Jani Nikula]

Prefer drm_err() over DRM_ERROR().

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/drm_modes.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 0fff5a8d4d81..bf0f745dd9bd 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -386,8 +386,8 @@ static int fill_analog_mode(struct drm_device *dev,
        if (!bt601 &&
            (hact_duration_ns < params->hact_ns.min ||
             hact_duration_ns > params->hact_ns.max)) {
-               DRM_ERROR("Invalid horizontal active area duration: %uns (min: 
%u, max %u)\n",
-                         hact_duration_ns, params->hact_ns.min, 
params->hact_ns.max);
+               drm_err(dev, "Invalid horizontal active area duration: %uns 
(min: %u, max %u)\n",
+                       hact_duration_ns, params->hact_ns.min, 
params->hact_ns.max);
                return -EINVAL;
        }
 
@@ -398,8 +398,8 @@ static int fill_analog_mode(struct drm_device *dev,
        if (!bt601 &&
            (hblk_duration_ns < params->hblk_ns.min ||
             hblk_duration_ns > params->hblk_ns.max)) {
-               DRM_ERROR("Invalid horizontal blanking duration: %uns (min: %u, 
max %u)\n",
-                         hblk_duration_ns, params->hblk_ns.min, 
params->hblk_ns.max);
+               drm_err(dev, "Invalid horizontal blanking duration: %uns (min: 
%u, max %u)\n",
+                       hblk_duration_ns, params->hblk_ns.min, 
params->hblk_ns.max);
                return -EINVAL;
        }
 
@@ -410,8 +410,8 @@ static int fill_analog_mode(struct drm_device *dev,
        if (!bt601 &&
            (hslen_duration_ns < params->hslen_ns.min ||
             hslen_duration_ns > params->hslen_ns.max)) {
-               DRM_ERROR("Invalid horizontal sync duration: %uns (min: %u, max 
%u)\n",
-                         hslen_duration_ns, params->hslen_ns.min, 
params->hslen_ns.max);
+               drm_err(dev, "Invalid horizontal sync duration: %uns (min: %u, 
max %u)\n",
+                       hslen_duration_ns, params->hslen_ns.min, 
params->hslen_ns.max);
                return -EINVAL;
        }
 
@@ -422,7 +422,8 @@ static int fill_analog_mode(struct drm_device *dev,
        if (!bt601 &&
            (porches_duration_ns > (params->hfp_ns.max + params->hbp_ns.max) ||
             porches_duration_ns < (params->hfp_ns.min + params->hbp_ns.min))) {
-               DRM_ERROR("Invalid horizontal porches duration: %uns\n", 
porches_duration_ns);
+               drm_err(dev, "Invalid horizontal porches duration: %uns\n",
+                       porches_duration_ns);
                return -EINVAL;
        }
 
@@ -444,8 +445,8 @@ static int fill_analog_mode(struct drm_device *dev,
        if (!bt601 &&
            (hfp_duration_ns < params->hfp_ns.min ||
             hfp_duration_ns > params->hfp_ns.max)) {
-               DRM_ERROR("Invalid horizontal front porch duration: %uns (min: 
%u, max %u)\n",
-                         hfp_duration_ns, params->hfp_ns.min, 
params->hfp_ns.max);
+               drm_err(dev, "Invalid horizontal front porch duration: %uns 
(min: %u, max %u)\n",
+                       hfp_duration_ns, params->hfp_ns.min, 
params->hfp_ns.max);
                return -EINVAL;
        }
 
@@ -456,8 +457,8 @@ static int fill_analog_mode(struct drm_device *dev,
        if (!bt601 &&
            (hbp_duration_ns < params->hbp_ns.min ||
             hbp_duration_ns > params->hbp_ns.max)) {
-               DRM_ERROR("Invalid horizontal back porch duration: %uns (min: 
%u, max %u)\n",
-                         hbp_duration_ns, params->hbp_ns.min, 
params->hbp_ns.max);
+               drm_err(dev, "Invalid horizontal back porch duration: %uns 
(min: %u, max %u)\n",
+                       hbp_duration_ns, params->hbp_ns.min, 
params->hbp_ns.max);
                return -EINVAL;
        }
 
@@ -508,8 +509,8 @@ static int fill_analog_mode(struct drm_device *dev,
 
        vtotal = vactive + vfp + vslen + vbp;
        if (params->num_lines != vtotal) {
-               DRM_ERROR("Invalid vertical total: %upx (expected %upx)\n",
-                         vtotal, params->num_lines);
+               drm_err(dev, "Invalid vertical total: %upx (expected %upx)\n",
+                       vtotal, params->num_lines);
                return -EINVAL;
        }
 
-- 
2.39.2