Commit 6d45fff5 authored by Suraj Upadhyay's avatar Suraj Upadhyay Committed by Daniel Vetter
Browse files

drm: core: Convert device logging to drm_* functions. 



Convert device logging with dev_* functions into drm_* functions.

The patch has been generated with the coccinelle script below.
The script focuses on instances of dev_* functions where the drm device
context is clearly visible in its arguments.

@@expression E1; expression list E2; @@
-dev_warn(E1->dev, E2)
+drm_warn(E1, E2)

@@expression E1; expression list E2; @@
-dev_info(E1->dev, E2)
+drm_info(E1, E2)

@@expression E1; expression list E2; @@
-dev_err(E1->dev, E2)
+drm_err(E1, E2)

@@expression E1; expression list E2; @@
-dev_info_once(E1->dev, E2)
+drm_info_once(E1, E2)

@@expression E1; expression list E2; @@
-dev_notice_once(E1->dev, E2)
+drm_notice_once(E1, E2)

@@expression E1; expression list E2; @@
-dev_warn_once(E1->dev, E2)
+drm_warn_once(E1, E2)

@@expression E1; expression list E2; @@
-dev_err_once(E1->dev, E2)
+drm_err_once(E1, E2)

@@expression E1; expression list E2; @@
-dev_err_ratelimited(E1->dev, E2)
+drm_err_ratelimited(E1, E2)

@@expression E1; expression list E2; @@
-dev_dbg(E1->dev, E2)
+drm_dbg(E1, E2)

Signed-off-by: default avatarSuraj Upadhyay <usuraj35@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200718150955.GA23103@blackclown
parent 880a7485

drivers/gpu/drm/drm_edid.c

+2 −4
Original line number Diff line number Diff line
@@ -1844,9 +1844,7 @@ static void connector_bad_edid(struct drm_connector *connector, 
	if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))

		return;



	dev_warn(connector->dev->dev,

		 "%s: EDID is invalid:\n",

		 connector->name);

	drm_warn(connector->dev, "%s: EDID is invalid:\n", connector->name);

	for (i = 0; i < num_blocks; i++) {

		u8 *block = edid + i * EDID_LENGTH;

		char prefix[20];
@@ -5298,7 +5296,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) 
	}

	if (!drm_edid_is_valid(edid)) {

		clear_eld(connector);

		dev_warn(connector->dev->dev, "%s: EDID invalid.\n",

		drm_warn(connector->dev, "%s: EDID invalid.\n",

			 connector->name);

		return 0;

	}

drivers/gpu/drm/drm_gem_cma_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, 
	cma_obj->vaddr = dma_alloc_wc(drm->dev, size, &cma_obj->paddr,

				      GFP_KERNEL | __GFP_NOWARN);

	if (!cma_obj->vaddr) {

		dev_dbg(drm->dev, "failed to allocate buffer with size %zu\n",

		drm_dbg(drm, "failed to allocate buffer with size %zu\n",

			 size);

		ret = -ENOMEM;

		goto error;

drivers/gpu/drm/drm_mipi_dbi.c

+3 −4
Original line number Diff line number Diff line
@@ -225,9 +225,8 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb, 
		drm_fb_xrgb8888_to_rgb565(dst, src, fb, clip, swap);

		break;

	default:

		dev_err_once(fb->dev->dev, "Format is not supported: %s\n",

			     drm_get_format_name(fb->format->format,

						 &format_name));

		drm_err_once(fb->dev, "Format is not supported: %s\n",

			     drm_get_format_name(fb->format->format, &format_name));

		return -EINVAL;

	}
@@ -295,7 +294,7 @@ static void mipi_dbi_fb_dirty(struct drm_framebuffer *fb, struct drm_rect *rect) 
				   width * height * 2);

err_msg:

	if (ret)

		dev_err_once(fb->dev->dev, "Failed to update display %d\n", ret);

		drm_err_once(fb->dev, "Failed to update display %d\n", ret);



	drm_dev_exit(idx);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE