Commit 1f7596f4 authored by Paul Cercueil's avatar Paul Cercueil

drm/ingenic: Add missing CR in debug strings

If you pass a string that is not terminated with a carriage return to
dev_err(), it will eventually be printed with a carriage return, but
not right away, since the kernel will wait for a pr_cont().

v2: New patch
v3: No change
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200716163846.174790-5-paul@crapouillou.net
parent 54fe8942
...@@ -623,14 +623,14 @@ static int ingenic_drm_probe(struct platform_device *pdev) ...@@ -623,14 +623,14 @@ static int ingenic_drm_probe(struct platform_device *pdev)
base = devm_platform_ioremap_resource(pdev, 0); base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base)) { if (IS_ERR(base)) {
dev_err(dev, "Failed to get memory resource"); dev_err(dev, "Failed to get memory resource\n");
return PTR_ERR(base); return PTR_ERR(base);
} }
priv->map = devm_regmap_init_mmio(dev, base, priv->map = devm_regmap_init_mmio(dev, base,
&ingenic_drm_regmap_config); &ingenic_drm_regmap_config);
if (IS_ERR(priv->map)) { if (IS_ERR(priv->map)) {
dev_err(dev, "Failed to create regmap"); dev_err(dev, "Failed to create regmap\n");
return PTR_ERR(priv->map); return PTR_ERR(priv->map);
} }
...@@ -641,21 +641,21 @@ static int ingenic_drm_probe(struct platform_device *pdev) ...@@ -641,21 +641,21 @@ static int ingenic_drm_probe(struct platform_device *pdev)
if (soc_info->needs_dev_clk) { if (soc_info->needs_dev_clk) {
priv->lcd_clk = devm_clk_get(dev, "lcd"); priv->lcd_clk = devm_clk_get(dev, "lcd");
if (IS_ERR(priv->lcd_clk)) { if (IS_ERR(priv->lcd_clk)) {
dev_err(dev, "Failed to get lcd clock"); dev_err(dev, "Failed to get lcd clock\n");
return PTR_ERR(priv->lcd_clk); return PTR_ERR(priv->lcd_clk);
} }
} }
priv->pix_clk = devm_clk_get(dev, "lcd_pclk"); priv->pix_clk = devm_clk_get(dev, "lcd_pclk");
if (IS_ERR(priv->pix_clk)) { if (IS_ERR(priv->pix_clk)) {
dev_err(dev, "Failed to get pixel clock"); dev_err(dev, "Failed to get pixel clock\n");
return PTR_ERR(priv->pix_clk); return PTR_ERR(priv->pix_clk);
} }
ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, &bridge); ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, &bridge);
if (ret) { if (ret) {
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get panel handle"); dev_err(dev, "Failed to get panel handle\n");
return ret; return ret;
} }
...@@ -684,7 +684,7 @@ static int ingenic_drm_probe(struct platform_device *pdev) ...@@ -684,7 +684,7 @@ static int ingenic_drm_probe(struct platform_device *pdev)
ARRAY_SIZE(ingenic_drm_primary_formats), ARRAY_SIZE(ingenic_drm_primary_formats),
NULL, DRM_PLANE_TYPE_PRIMARY, NULL); NULL, DRM_PLANE_TYPE_PRIMARY, NULL);
if (ret) { if (ret) {
dev_err(dev, "Failed to register primary plane: %i", ret); dev_err(dev, "Failed to register primary plane: %i\n", ret);
return ret; return ret;
} }
...@@ -693,7 +693,7 @@ static int ingenic_drm_probe(struct platform_device *pdev) ...@@ -693,7 +693,7 @@ static int ingenic_drm_probe(struct platform_device *pdev)
ret = drm_crtc_init_with_planes(drm, &priv->crtc, &priv->primary, ret = drm_crtc_init_with_planes(drm, &priv->crtc, &priv->primary,
NULL, &ingenic_drm_crtc_funcs, NULL); NULL, &ingenic_drm_crtc_funcs, NULL);
if (ret) { if (ret) {
dev_err(dev, "Failed to init CRTC: %i", ret); dev_err(dev, "Failed to init CRTC: %i\n", ret);
return ret; return ret;
} }
...@@ -705,25 +705,25 @@ static int ingenic_drm_probe(struct platform_device *pdev) ...@@ -705,25 +705,25 @@ static int ingenic_drm_probe(struct platform_device *pdev)
ret = drm_simple_encoder_init(drm, &priv->encoder, ret = drm_simple_encoder_init(drm, &priv->encoder,
DRM_MODE_ENCODER_DPI); DRM_MODE_ENCODER_DPI);
if (ret) { if (ret) {
dev_err(dev, "Failed to init encoder: %i", ret); dev_err(dev, "Failed to init encoder: %i\n", ret);
return ret; return ret;
} }
ret = drm_bridge_attach(&priv->encoder, bridge, NULL, 0); ret = drm_bridge_attach(&priv->encoder, bridge, NULL, 0);
if (ret) { if (ret) {
dev_err(dev, "Unable to attach bridge"); dev_err(dev, "Unable to attach bridge\n");
return ret; return ret;
} }
ret = drm_irq_install(drm, irq); ret = drm_irq_install(drm, irq);
if (ret) { if (ret) {
dev_err(dev, "Unable to install IRQ handler"); dev_err(dev, "Unable to install IRQ handler\n");
return ret; return ret;
} }
ret = drm_vblank_init(drm, 1); ret = drm_vblank_init(drm, 1);
if (ret) { if (ret) {
dev_err(dev, "Failed calling drm_vblank_init()"); dev_err(dev, "Failed calling drm_vblank_init()\n");
return ret; return ret;
} }
...@@ -731,7 +731,7 @@ static int ingenic_drm_probe(struct platform_device *pdev) ...@@ -731,7 +731,7 @@ static int ingenic_drm_probe(struct platform_device *pdev)
ret = clk_prepare_enable(priv->pix_clk); ret = clk_prepare_enable(priv->pix_clk);
if (ret) { if (ret) {
dev_err(dev, "Unable to start pixel clock"); dev_err(dev, "Unable to start pixel clock\n");
return ret; return ret;
} }
...@@ -746,20 +746,20 @@ static int ingenic_drm_probe(struct platform_device *pdev) ...@@ -746,20 +746,20 @@ static int ingenic_drm_probe(struct platform_device *pdev)
*/ */
ret = clk_set_rate(priv->lcd_clk, parent_rate); ret = clk_set_rate(priv->lcd_clk, parent_rate);
if (ret) { if (ret) {
dev_err(dev, "Unable to set LCD clock rate"); dev_err(dev, "Unable to set LCD clock rate\n");
goto err_pixclk_disable; goto err_pixclk_disable;
} }
ret = clk_prepare_enable(priv->lcd_clk); ret = clk_prepare_enable(priv->lcd_clk);
if (ret) { if (ret) {
dev_err(dev, "Unable to start lcd clock"); dev_err(dev, "Unable to start lcd clock\n");
goto err_pixclk_disable; goto err_pixclk_disable;
} }
} }
ret = drm_dev_register(drm, 0); ret = drm_dev_register(drm, 0);
if (ret) { if (ret) {
dev_err(dev, "Failed to register DRM driver"); dev_err(dev, "Failed to register DRM driver\n");
goto err_devclk_disable; goto err_devclk_disable;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment