drm: core: Convert device logging to drm_* functions.
Subsystems (2)
PATCH v2 1/1 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)
---
Changes:
v2: Fixed error in coccinelle script and diff,
i.e. removed the underscore.
drv_dbg_ -> drm_dbg
drivers/gpu/drm/drm_edid.c | 6 ++---- drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++-- drivers/gpu/drm/drm_mipi_dbi.c | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_edid.c +2 -4
@@ -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
@@ -105,8 +105,8 @@ 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" , - size); +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
@@ -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); }
Signature · 1 line
2.17.1
Daniel Vetter
AppliedQuoted 42 lines · Suraj Upadhyay
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; @@
(quoted diff) +1
-1-dev_warn(E1->dev, E2) +drm_warn(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_info(E1->dev, E2) +drm_info(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_err(E1->dev, E2) +drm_err(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_info_once(E1->dev, E2) +drm_info_once(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_notice_once(E1->dev, E2) +drm_notice_once(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_warn_once(E1->dev, E2) +drm_warn_once(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_err_once(E1->dev, E2) +drm_err_once(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_err_ratelimited(E1->dev, E2) +drm_err_ratelimited(E1, E2)@@expression E1; expression list E2; @@
(quoted diff) +1
-1-dev_dbg(E1->dev, E2) +drm_dbg(E1, E2)
Quoted 6 lines
Signed-off-by Suraj Upadhyay <[email protected]>---
Changes:
v2: Fixed error in coccinelle script and diff,
i.e. removed the underscore.
drv_dbg_->drm_dbg
Applied to drm-misc-next, thanks for your patch. Will probably go to 5.10 because drm is already in feature freeze.
-Daniel
Quoted 73 lines
drivers/gpu/drm/drm_edid.c | 6 ++---- drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++-- drivers/gpu/drm/drm_mipi_dbi.c | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-)drivers/gpu/drm/drm_edid.c +2
-4@@ -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@@ -105,8 +105,8 @@ 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" , - size); +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@@ -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); }Signature · 1 line
2.17.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel