[v2,02/10] video: stm32: stm32_ltdc: update debug log
diff mbox

Message ID 1520005451-23217-3-git-send-email-yannick.fertre@st.com
State New
Headers show

Commit Message

Yannick Fertre March 2, 2018, 3:44 p.m. UTC
Replace  macro debug by pr_error, pr_warn or pr_info.

Signed-off-by: yannick fertre <yannick.fertre@st.com>
---
 drivers/video/stm32/stm32_ltdc.c | 62 ++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

Comments

Patrice CHOTARD March 13, 2018, 8:48 a.m. UTC | #1
Hi Yannick

On 03/02/2018 04:44 PM, yannick fertre wrote:
> Replace  macro debug by pr_error, pr_warn or pr_info.

> 

> Signed-off-by: yannick fertre <yannick.fertre@st.com>

> ---

>   drivers/video/stm32/stm32_ltdc.c | 62 ++++++++++++++++++++--------------------

>   1 file changed, 31 insertions(+), 31 deletions(-)

> 

> diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c

> index bd9c0de..e95f35c 100644

> --- a/drivers/video/stm32/stm32_ltdc.c

> +++ b/drivers/video/stm32/stm32_ltdc.c

> @@ -176,13 +176,13 @@ static u32 stm32_ltdc_get_pixel_format(enum video_log2_bpp l2bpp)

>   	case VIDEO_BPP2:

>   	case VIDEO_BPP4:

>   	default:

> -		debug("%s: warning %dbpp not supported yet, %dbpp instead\n",

> -		      __func__, VNBITS(l2bpp), VNBITS(VIDEO_BPP16));

> +		pr_warn("%s: warning %dbpp not supported yet, %dbpp instead\n",

> +			__func__, VNBITS(l2bpp), VNBITS(VIDEO_BPP16));

>   		pf = PF_RGB565;

>   		break;

>   	}

>   

> -	debug("%s: %d bpp -> ltdc pf %d\n", __func__, VNBITS(l2bpp), pf);

> +	pr_info("%s: %d bpp -> ltdc pf %d\n", __func__, VNBITS(l2bpp), pf);

>   

>   	return (u32)pf;

>   }

> @@ -249,7 +249,7 @@ static void stm32_ltdc_set_mode(struct stm32_ltdc_priv *priv,

>   

>   	/* Signal polarities */

>   	val = 0;

> -	debug("%s: timing->flags 0x%08x\n", __func__, timings->flags);

> +	pr_info("%s: timing->flags 0x%08x\n", __func__, timings->flags);

>   	if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH)

>   		val |= GCR_HSPOL;

>   	if (timings->flags & DISPLAY_FLAGS_VSYNC_HIGH)

> @@ -343,26 +343,26 @@ static int stm32_ltdc_probe(struct udevice *dev)

>   

>   	priv->regs = (void *)dev_read_addr(dev);

>   	if ((fdt_addr_t)priv->regs == FDT_ADDR_T_NONE) {

> -		debug("%s: ltdc dt register address error\n", __func__);

> +		pr_err("%s: ltdc dt register address error\n", __func__);


As you get access to the struct udevice, prefer dev_err() here.

>   		return -EINVAL;

>   	}

>   

>   	ret = clk_get_by_index(dev, 0, &pclk);

>   	if (ret) {

> -		debug("%s: peripheral clock get error %d\n", __func__, ret);

> +		pr_err("%s: peripheral clock get error %d\n", __func__, ret);


ditto

>   		return ret;

>   	}

>   

>   	ret = clk_enable(&pclk);

>   	if (ret) {

> -		debug("%s: peripheral clock enable error %d\n",

> -		      __func__, ret);

> +		pr_err("%s: peripheral clock enable error %d\n",

> +		       __func__, ret);

ditto
>   		return ret;

>   	}

>   

>   	ret = reset_get_by_index(dev, 0, &rst);

>   	if (ret) {

> -		debug("%s: missing ltdc hardware reset\n", __func__);

> +		pr_err("%s: missing ltdc hardware reset\n", __func__);

ditto
>   		return -ENODEV;

>   	}

>   

> @@ -372,41 +372,40 @@ static int stm32_ltdc_probe(struct udevice *dev)

>   #ifdef CONFIG_VIDEO_BRIDGE

>   	ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &bridge);

>   	if (ret) {

> -		debug("%s: No video bridge, or no backlight on bridge\n",

> -		      __func__);

> +		pr_info("%s: No video bridge, or no backlight on bridge\n",

> +			__func__);


dev_info()

>   	}

>   

>   	if (bridge) {

>   		ret = video_bridge_attach(bridge);

>   		if (ret) {

> -			debug("%s: fail to attach bridge\n", __func__);

> +			pr_err("%s: fail to attach bridge\n", __func__);


dev_err()

>   			return ret;

>   		}

>   	}

>   #endif

>   	ret = uclass_first_device(UCLASS_PANEL, &panel);

>   	if (ret) {

> -		debug("%s: panel device error %d\n", __func__, ret);

> +		pr_err("%s: panel device error %d\n", __func__, ret);


ditto

>   		return ret;

>   	}

>   

>   	ret = fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(panel),

>   					   0, &timings);

>   	if (ret) {

> -		debug("%s: decode display timing error %d\n",

> -		      __func__, ret);

> +		pr_err("%s: decode display timing error %d\n", __func__, ret);


ditto

>   		return ret;

>   	}

>   

>   	rate = clk_set_rate(&pclk, timings.pixelclock.typ);

>   	if (rate < 0) {

> -		debug("%s: fail to set pixel clock %d hz %d hz\n",

> -		      __func__, timings.pixelclock.typ, rate);

> +		pr_err("%s: fail to set pixel clock %d hz %d hz\n",

> +		       __func__, timings.pixelclock.typ, rate);


ditto

>   		return rate;

>   	}

>   

> -	debug("%s: Set pixel clock req %d hz get %d hz\n", __func__,

> -	      timings.pixelclock.typ, rate);

> +	pr_info("%s: Set pixel clock req %d hz get %d hz\n", __func__,

> +		timings.pixelclock.typ, rate);

>   

>   	/* TODO Below parameters are hard-coded for the moment... */

>   	priv->l2bpp = VIDEO_BPP16;

> @@ -417,12 +416,12 @@ static int stm32_ltdc_probe(struct udevice *dev)

>   	priv->crop_h = timings.vactive.typ;

>   	priv->alpha = 0xFF;

>   

> -	debug("%s: %dx%d %dbpp frame buffer at 0x%lx\n", __func__,

> -	      timings.hactive.typ, timings.vactive.typ,

> -	      VNBITS(priv->l2bpp), uc_plat->base);

> -	debug("%s: crop %d,%d %dx%d bg 0x%08x alpha %d\n", __func__,

> -	      priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h,

> -	      priv->bg_col_argb, priv->alpha);

> +	pr_info("%s: %dx%d %dbpp frame buffer at 0x%lx\n", __func__,

> +		timings.hactive.typ, timings.vactive.typ,

> +		VNBITS(priv->l2bpp), uc_plat->base);

> +	pr_info("%s: crop %d,%d %dx%d bg 0x%08x alpha %d\n", __func__,

> +		priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h,

> +		priv->bg_col_argb, priv->alpha);



dev_info()

>   

>   	/* Configure & start LTDC */

>   	stm32_ltdc_set_mode(priv, &timings);

> @@ -437,22 +436,22 @@ static int stm32_ltdc_probe(struct udevice *dev)

>   	if (bridge) {

>   		ret = video_bridge_set_backlight(bridge, 80);

>   		if (ret) {

> -			debug("%s: fail to set backlight\n", __func__);

> +			pr_err("%s: fail to set backlight\n", __func__);


dev_err()

>   			return ret;

>   		}

>   	} else {

>   		ret = panel_enable_backlight(panel);

>   		if (ret) {

> -			debug("%s: panel %s enable backlight error %d\n",

> -			      __func__, panel->name, ret);

> +			pr_err("%s: panel %s enable backlight error %d\n",

> +			       __func__, panel->name, ret);


ditto

>   			return ret;

>   		}

>   	}

>   #else

>   	ret = panel_enable_backlight(panel);

>   	if (ret) {

> -		debug("%s: panel %s enable backlight error %d\n",

> -		      __func__, panel->name, ret);

> +		pr_err("%s: panel %s enable backlight error %d\n",

> +		       __func__, panel->name, ret);


ditto

>   		return ret;

>   	}

>   #endif

> @@ -468,7 +467,8 @@ static int stm32_ltdc_bind(struct udevice *dev)

>   	uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES *

>   			CONFIG_VIDEO_STM32_MAX_YRES *

>   			(CONFIG_VIDEO_STM32_MAX_BPP >> 3);

> -	debug("%s: frame buffer max size %d bytes\n", __func__, uc_plat->size);

> +	pr_info("%s: frame buffer max size %d bytes\n", __func__,


dev_info()

> +		uc_plat->size);

>   

>   	return 0;

>   }

> 


Thanks

Patrice

Patch
diff mbox

diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c
index bd9c0de..e95f35c 100644
--- a/drivers/video/stm32/stm32_ltdc.c
+++ b/drivers/video/stm32/stm32_ltdc.c
@@ -176,13 +176,13 @@  static u32 stm32_ltdc_get_pixel_format(enum video_log2_bpp l2bpp)
 	case VIDEO_BPP2:
 	case VIDEO_BPP4:
 	default:
-		debug("%s: warning %dbpp not supported yet, %dbpp instead\n",
-		      __func__, VNBITS(l2bpp), VNBITS(VIDEO_BPP16));
+		pr_warn("%s: warning %dbpp not supported yet, %dbpp instead\n",
+			__func__, VNBITS(l2bpp), VNBITS(VIDEO_BPP16));
 		pf = PF_RGB565;
 		break;
 	}
 
-	debug("%s: %d bpp -> ltdc pf %d\n", __func__, VNBITS(l2bpp), pf);
+	pr_info("%s: %d bpp -> ltdc pf %d\n", __func__, VNBITS(l2bpp), pf);
 
 	return (u32)pf;
 }
@@ -249,7 +249,7 @@  static void stm32_ltdc_set_mode(struct stm32_ltdc_priv *priv,
 
 	/* Signal polarities */
 	val = 0;
-	debug("%s: timing->flags 0x%08x\n", __func__, timings->flags);
+	pr_info("%s: timing->flags 0x%08x\n", __func__, timings->flags);
 	if (timings->flags & DISPLAY_FLAGS_HSYNC_HIGH)
 		val |= GCR_HSPOL;
 	if (timings->flags & DISPLAY_FLAGS_VSYNC_HIGH)
@@ -343,26 +343,26 @@  static int stm32_ltdc_probe(struct udevice *dev)
 
 	priv->regs = (void *)dev_read_addr(dev);
 	if ((fdt_addr_t)priv->regs == FDT_ADDR_T_NONE) {
-		debug("%s: ltdc dt register address error\n", __func__);
+		pr_err("%s: ltdc dt register address error\n", __func__);
 		return -EINVAL;
 	}
 
 	ret = clk_get_by_index(dev, 0, &pclk);
 	if (ret) {
-		debug("%s: peripheral clock get error %d\n", __func__, ret);
+		pr_err("%s: peripheral clock get error %d\n", __func__, ret);
 		return ret;
 	}
 
 	ret = clk_enable(&pclk);
 	if (ret) {
-		debug("%s: peripheral clock enable error %d\n",
-		      __func__, ret);
+		pr_err("%s: peripheral clock enable error %d\n",
+		       __func__, ret);
 		return ret;
 	}
 
 	ret = reset_get_by_index(dev, 0, &rst);
 	if (ret) {
-		debug("%s: missing ltdc hardware reset\n", __func__);
+		pr_err("%s: missing ltdc hardware reset\n", __func__);
 		return -ENODEV;
 	}
 
@@ -372,41 +372,40 @@  static int stm32_ltdc_probe(struct udevice *dev)
 #ifdef CONFIG_VIDEO_BRIDGE
 	ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &bridge);
 	if (ret) {
-		debug("%s: No video bridge, or no backlight on bridge\n",
-		      __func__);
+		pr_info("%s: No video bridge, or no backlight on bridge\n",
+			__func__);
 	}
 
 	if (bridge) {
 		ret = video_bridge_attach(bridge);
 		if (ret) {
-			debug("%s: fail to attach bridge\n", __func__);
+			pr_err("%s: fail to attach bridge\n", __func__);
 			return ret;
 		}
 	}
 #endif
 	ret = uclass_first_device(UCLASS_PANEL, &panel);
 	if (ret) {
-		debug("%s: panel device error %d\n", __func__, ret);
+		pr_err("%s: panel device error %d\n", __func__, ret);
 		return ret;
 	}
 
 	ret = fdtdec_decode_display_timing(gd->fdt_blob, dev_of_offset(panel),
 					   0, &timings);
 	if (ret) {
-		debug("%s: decode display timing error %d\n",
-		      __func__, ret);
+		pr_err("%s: decode display timing error %d\n", __func__, ret);
 		return ret;
 	}
 
 	rate = clk_set_rate(&pclk, timings.pixelclock.typ);
 	if (rate < 0) {
-		debug("%s: fail to set pixel clock %d hz %d hz\n",
-		      __func__, timings.pixelclock.typ, rate);
+		pr_err("%s: fail to set pixel clock %d hz %d hz\n",
+		       __func__, timings.pixelclock.typ, rate);
 		return rate;
 	}
 
-	debug("%s: Set pixel clock req %d hz get %d hz\n", __func__,
-	      timings.pixelclock.typ, rate);
+	pr_info("%s: Set pixel clock req %d hz get %d hz\n", __func__,
+		timings.pixelclock.typ, rate);
 
 	/* TODO Below parameters are hard-coded for the moment... */
 	priv->l2bpp = VIDEO_BPP16;
@@ -417,12 +416,12 @@  static int stm32_ltdc_probe(struct udevice *dev)
 	priv->crop_h = timings.vactive.typ;
 	priv->alpha = 0xFF;
 
-	debug("%s: %dx%d %dbpp frame buffer at 0x%lx\n", __func__,
-	      timings.hactive.typ, timings.vactive.typ,
-	      VNBITS(priv->l2bpp), uc_plat->base);
-	debug("%s: crop %d,%d %dx%d bg 0x%08x alpha %d\n", __func__,
-	      priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h,
-	      priv->bg_col_argb, priv->alpha);
+	pr_info("%s: %dx%d %dbpp frame buffer at 0x%lx\n", __func__,
+		timings.hactive.typ, timings.vactive.typ,
+		VNBITS(priv->l2bpp), uc_plat->base);
+	pr_info("%s: crop %d,%d %dx%d bg 0x%08x alpha %d\n", __func__,
+		priv->crop_x, priv->crop_y, priv->crop_w, priv->crop_h,
+		priv->bg_col_argb, priv->alpha);
 
 	/* Configure & start LTDC */
 	stm32_ltdc_set_mode(priv, &timings);
@@ -437,22 +436,22 @@  static int stm32_ltdc_probe(struct udevice *dev)
 	if (bridge) {
 		ret = video_bridge_set_backlight(bridge, 80);
 		if (ret) {
-			debug("%s: fail to set backlight\n", __func__);
+			pr_err("%s: fail to set backlight\n", __func__);
 			return ret;
 		}
 	} else {
 		ret = panel_enable_backlight(panel);
 		if (ret) {
-			debug("%s: panel %s enable backlight error %d\n",
-			      __func__, panel->name, ret);
+			pr_err("%s: panel %s enable backlight error %d\n",
+			       __func__, panel->name, ret);
 			return ret;
 		}
 	}
 #else
 	ret = panel_enable_backlight(panel);
 	if (ret) {
-		debug("%s: panel %s enable backlight error %d\n",
-		      __func__, panel->name, ret);
+		pr_err("%s: panel %s enable backlight error %d\n",
+		       __func__, panel->name, ret);
 		return ret;
 	}
 #endif
@@ -468,7 +467,8 @@  static int stm32_ltdc_bind(struct udevice *dev)
 	uc_plat->size = CONFIG_VIDEO_STM32_MAX_XRES *
 			CONFIG_VIDEO_STM32_MAX_YRES *
 			(CONFIG_VIDEO_STM32_MAX_BPP >> 3);
-	debug("%s: frame buffer max size %d bytes\n", __func__, uc_plat->size);
+	pr_info("%s: frame buffer max size %d bytes\n", __func__,
+		uc_plat->size);
 
 	return 0;
 }