[PATCH v1 04/19] drm/panel: arm-versatile: use DRM_DEV*

Sam Ravnborg sam at ravnborg.org
Thu Jan 31 19:26:04 UTC 2019


Introduce use of DRM_DEV* for logging.
This makes logging in the drm subsystem more consistent.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Thierry Reding <thierry.reding at gmail.com>
Cc: David Airlie <airlied at linux.ie>
Cc: Daniel Vetter <daniel at ffwll.ch>
Cc: Stefan Mavrodiev <stefan at olimex.com>
---
 drivers/gpu/drm/panel/panel-arm-versatile.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-arm-versatile.c b/drivers/gpu/drm/panel/panel-arm-versatile.c
index 0ed8ee4673eb..d7139b7aff7d 100644
--- a/drivers/gpu/drm/panel/panel-arm-versatile.c
+++ b/drivers/gpu/drm/panel/panel-arm-versatile.c
@@ -27,6 +27,7 @@
  */
 #include <drm/drm_modes.h>
 #include <drm/drm_panel.h>
+#include <drm/drm_print.h>
 
 #include <linux/bitops.h>
 #include <linux/init.h>
@@ -233,7 +234,7 @@ static int versatile_panel_disable(struct drm_panel *panel)
 
 	/* If we're on an IB2 daughterboard, turn off display */
 	if (vpanel->ib2_map) {
-		dev_dbg(vpanel->dev, "disable IB2 display\n");
+		DRM_DEV_DEBUG(vpanel->dev, "disable IB2 display\n");
 		regmap_update_bits(vpanel->ib2_map,
 				   IB2_CTRL,
 				   IB2_CTRL_LCD_MASK,
@@ -249,7 +250,7 @@ static int versatile_panel_enable(struct drm_panel *panel)
 
 	/* If we're on an IB2 daughterboard, turn on display */
 	if (vpanel->ib2_map) {
-		dev_dbg(vpanel->dev, "enable IB2 display\n");
+		DRM_DEV_DEBUG(vpanel->dev, "enable IB2 display\n");
 		regmap_update_bits(vpanel->ib2_map,
 				   IB2_CTRL,
 				   IB2_CTRL_LCD_MASK,
@@ -300,12 +301,12 @@ static int versatile_panel_probe(struct platform_device *pdev)
 
 	parent = dev->parent;
 	if (!parent) {
-		dev_err(dev, "no parent for versatile panel\n");
+		DRM_DEV_ERROR(dev, "no parent for versatile panel\n");
 		return -ENODEV;
 	}
 	map = syscon_node_to_regmap(parent->of_node);
 	if (IS_ERR(map)) {
-		dev_err(dev, "no regmap for versatile panel parent\n");
+		DRM_DEV_ERROR(dev, "no regmap for versatile panel parent\n");
 		return PTR_ERR(map);
 	}
 
@@ -315,7 +316,7 @@ static int versatile_panel_probe(struct platform_device *pdev)
 
 	ret = regmap_read(map, SYS_CLCD, &val);
 	if (ret) {
-		dev_err(dev, "cannot access syscon regs\n");
+		DRM_DEV_ERROR(dev, "cannot access syscon regs\n");
 		return ret;
 	}
 
@@ -333,11 +334,11 @@ static int versatile_panel_probe(struct platform_device *pdev)
 
 	/* No panel detected or VGA, let's leave this show */
 	if (i == ARRAY_SIZE(versatile_panels)) {
-		dev_info(dev, "no panel detected\n");
+		DRM_DEV_INFO(dev, "no panel detected\n");
 		return -ENODEV;
 	}
 
-	dev_info(dev, "detected: %s\n", vpanel->panel_type->name);
+	DRM_DEV_INFO(dev, "detected: %s\n", vpanel->panel_type->name);
 	vpanel->dev = dev;
 	vpanel->map = map;
 
@@ -348,7 +349,8 @@ static int versatile_panel_probe(struct platform_device *pdev)
 		if (IS_ERR(vpanel->ib2_map))
 			vpanel->ib2_map = NULL;
 		else
-			dev_info(dev, "panel mounted on IB2 daughterboard\n");
+			DRM_DEV_INFO(dev,
+				     "panel mounted on IB2 daughterboard\n");
 	}
 
 	drm_panel_init(&vpanel->panel);
-- 
2.12.0



More information about the dri-devel mailing list