Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dfe162a authored by Joe Perches's avatar Joe Perches Committed by Daniel Vetter
Browse files

gpu: drm: drivers: Convert printk(KERN_<LEVEL> to pr_<level> 



Use a more common logging style.

Miscellanea:

o Coalesce formats and realign arguments
o Neaten a few macros now using pr_<level>

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
Acked-by: default avatarSinclair Yeh <syeh@vmware.com>
Acked-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/76355db47b31668bb64d996865ceee53bd66b11f.1488285953.git.joe@perches.com
parent 0f445486

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+4 −5
Original line number Diff line number Diff line
@@ -284,8 +284,7 @@ static bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder, 
			    head) {

		if (tmp_encoder != encoder

		    && tmp_encoder->crtc == encoder->crtc) {

			printk(KERN_ERR "Can't enable LVDS and another "

			       "encoder on the same pipe\n");

			pr_err("Can't enable LVDS and another encoder on the same pipe\n");

			return false;

		}

	}
@@ -756,13 +755,13 @@ void cdv_intel_lvds_init(struct drm_device *dev, 


failed_find:

	mutex_unlock(&dev->mode_config.mutex);

	printk(KERN_ERR "Failed find\n");

	pr_err("Failed find\n");

	psb_intel_i2c_destroy(gma_encoder->ddc_bus);

failed_ddc:

	printk(KERN_ERR "Failed DDC\n");

	pr_err("Failed DDC\n");

	psb_intel_i2c_destroy(gma_encoder->i2c_bus);

failed_blc_i2c:

	printk(KERN_ERR "Failed BLC\n");

	pr_err("Failed BLC\n");

	drm_encoder_cleanup(encoder);

	drm_connector_cleanup(connector);

	kfree(lvds_priv);

drivers/gpu/drm/gma500/oaktrail_lvds.c

+9 −9
Original line number Diff line number Diff line
@@ -255,15 +255,15 @@ static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev, 
				((ti->vblank_hi << 8) | ti->vblank_lo);

		mode->clock = ti->pixel_clock * 10;

#if 0

		printk(KERN_INFO "hdisplay is %d\n", mode->hdisplay);

		printk(KERN_INFO "vdisplay is %d\n", mode->vdisplay);

		printk(KERN_INFO "HSS is %d\n", mode->hsync_start);

		printk(KERN_INFO "HSE is %d\n", mode->hsync_end);

		printk(KERN_INFO "htotal is %d\n", mode->htotal);

		printk(KERN_INFO "VSS is %d\n", mode->vsync_start);

		printk(KERN_INFO "VSE is %d\n", mode->vsync_end);

		printk(KERN_INFO "vtotal is %d\n", mode->vtotal);

		printk(KERN_INFO "clock is %d\n", mode->clock);

		pr_info("hdisplay is %d\n", mode->hdisplay);

		pr_info("vdisplay is %d\n", mode->vdisplay);

		pr_info("HSS is %d\n", mode->hsync_start);

		pr_info("HSE is %d\n", mode->hsync_end);

		pr_info("htotal is %d\n", mode->htotal);

		pr_info("VSS is %d\n", mode->vsync_start);

		pr_info("VSE is %d\n", mode->vsync_end);

		pr_info("vtotal is %d\n", mode->vtotal);

		pr_info("clock is %d\n", mode->clock);

#endif

		mode_dev->panel_fixed_mode = mode;

	}

drivers/gpu/drm/gma500/psb_drv.h

+2 −3
Original line number Diff line number Diff line
@@ -905,8 +905,7 @@ static inline void REGISTER_WRITE8(struct drm_device *dev, 
#define PSB_RSGX32(_offs)						\

({									\

	if (inl(dev_priv->apm_base + PSB_APM_STS) & 0x3) {		\

		printk(KERN_ERR						\

			"access sgx when it's off!! (READ) %s, %d\n",	\

		pr_err("access sgx when it's off!! (READ) %s, %d\n",	\

		       __FILE__, __LINE__);				\

		melay(1000);						\

	}								\

drivers/gpu/drm/gma500/psb_intel_lvds.c

+3 −4
Original line number Diff line number Diff line
@@ -388,11 +388,11 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, 


	/* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */

	if (!IS_MRST(dev) && gma_crtc->pipe == 0) {

		printk(KERN_ERR "Can't support LVDS on pipe A\n");

		pr_err("Can't support LVDS on pipe A\n");

		return false;

	}

	if (IS_MRST(dev) && gma_crtc->pipe != 0) {

		printk(KERN_ERR "Must use PIPE A\n");

		pr_err("Must use PIPE A\n");

		return false;

	}

	/* Should never happen!! */
@@ -400,8 +400,7 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, 
			    head) {

		if (tmp_encoder != encoder

		    && tmp_encoder->crtc == encoder->crtc) {

			printk(KERN_ERR "Can't enable LVDS and another "

			       "encoder on the same pipe\n");

			pr_err("Can't enable LVDS and another encoder on the same pipe\n");

			return false;

		}

	}

drivers/gpu/drm/i915/i915_sw_fence.c

+4 −4
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static void timer_i915_sw_fence_wake(unsigned long data) 
{

	struct i915_sw_dma_fence_cb *cb = (struct i915_sw_dma_fence_cb *)data;



	printk(KERN_WARNING "asynchronous wait on fence %s:%s:%x timed out\n",

	pr_warn("asynchronous wait on fence %s:%s:%x timed out\n",

		cb->dma->ops->get_driver_name(cb->dma),

		cb->dma->ops->get_timeline_name(cb->dma),

		cb->dma->seqno);