]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm: atmel-hlcdc: replace dev_* print functions with drm_* variants
authorEslam Khafagy <eslam.medhat1993@gmail.com>
Wed, 13 Aug 2025 22:39:52 +0000 (01:39 +0300)
committerDharma Balasubiramani <dharma.b@microchip.com>
Wed, 8 Oct 2025 06:36:26 +0000 (12:06 +0530)
Update the Atmel HLCDC code to use DRM print macros drm_*() instead of
dev_warn() and dev_err(). This change ensures consistency with DRM
subsystem logging conventions [1].

[1]
Link: https://docs.kernel.org/gpu/todo.html#convert-logging-to-drm-functions-with-drm-device-parameter
Signed-off-by: Eslam Khafagy <eslam.medhat1993@gmail.com>
Reviewed-by: Manikandan Muralidharan <manikandan.m@microchip.com>
Link: https://lore.kernel.org/r/20250813224000.130292-1-eslam.medhat1993@gmail.com
Signed-off-by: Dharma Balasubiramani <dharma.b@microchip.com>
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

index 0f7ffb3ced200fa7dfbfe15296446067d8de1005..e0efc7309b1b256520eff29462431476f8589255 100644 (file)
@@ -20,6 +20,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_modeset_helper_vtables.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
 
@@ -215,32 +216,32 @@ static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c,
                if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                             !(status & ATMEL_XLCDC_CM),
                                             10, 1000))
-                       dev_warn(dev->dev, "Atmel LCDC status register CMSTS timeout\n");
+                       drm_warn(dev, "Atmel LCDC status register CMSTS timeout\n");
 
                regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_XLCDC_SD);
                if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                             status & ATMEL_XLCDC_SD,
                                             10, 1000))
-                       dev_warn(dev->dev, "Atmel LCDC status register SDSTS timeout\n");
+                       drm_warn(dev, "Atmel LCDC status register SDSTS timeout\n");
        }
 
        regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_HLCDC_DISP);
        if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                     !(status & ATMEL_HLCDC_DISP),
                                    10, 1000))
-               dev_warn(dev->dev, "Atmel LCDC status register DISPSTS timeout\n");
+               drm_warn(dev, "Atmel LCDC status register DISPSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_HLCDC_SYNC);
        if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                     !(status & ATMEL_HLCDC_SYNC),
                                    10, 1000))
-               dev_warn(dev->dev, "Atmel LCDC status register LCDSTS timeout\n");
+               drm_warn(dev, "Atmel LCDC status register LCDSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_DIS, ATMEL_HLCDC_PIXEL_CLK);
        if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                     !(status & ATMEL_HLCDC_PIXEL_CLK),
                                    10, 1000))
-               dev_warn(dev->dev, "Atmel LCDC status register CLKSTS timeout\n");
+               drm_warn(dev, "Atmel LCDC status register CLKSTS timeout\n");
 
        clk_disable_unprepare(crtc->dc->hlcdc->sys_clk);
        pinctrl_pm_select_sleep_state(dev->dev);
@@ -269,32 +270,32 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c,
        if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                     status & ATMEL_HLCDC_PIXEL_CLK,
                                     10, 1000))
-               dev_warn(dev->dev, "Atmel LCDC status register CLKSTS timeout\n");
+               drm_warn(dev, "Atmel LCDC status register CLKSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_HLCDC_SYNC);
        if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                     status & ATMEL_HLCDC_SYNC,
                                     10, 1000))
-               dev_warn(dev->dev, "Atmel LCDC status register LCDSTS timeout\n");
+               drm_warn(dev, "Atmel LCDC status register LCDSTS timeout\n");
 
        regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_HLCDC_DISP);
        if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                     status & ATMEL_HLCDC_DISP,
                                     10, 1000))
-               dev_warn(dev->dev, "Atmel LCDC status register DISPSTS timeout\n");
+               drm_warn(dev, "Atmel LCDC status register DISPSTS timeout\n");
 
        if (crtc->dc->desc->is_xlcdc) {
                regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_XLCDC_CM);
                if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                             status & ATMEL_XLCDC_CM,
                                             10, 1000))
-                       dev_warn(dev->dev, "Atmel LCDC status register CMSTS timeout\n");
+                       drm_warn(dev, "Atmel LCDC status register CMSTS timeout\n");
 
                regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_XLCDC_SD);
                if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,
                                             !(status & ATMEL_XLCDC_SD),
                                             10, 1000))
-                       dev_warn(dev->dev, "Atmel LCDC status register SDSTS timeout\n");
+                       drm_warn(dev, "Atmel LCDC status register SDSTS timeout\n");
        }
 
        pm_runtime_put_sync(dev->dev);
index fa8ad94e431af95280c365b4d7188b0fc3145b56..acb017a2486b76515db00bff396b3d20974c7d2a 100644 (file)
@@ -724,19 +724,19 @@ static int atmel_hlcdc_dc_modeset_init(struct drm_device *dev)
 
        ret = atmel_hlcdc_create_outputs(dev);
        if (ret) {
-               dev_err(dev->dev, "failed to create HLCDC outputs: %d\n", ret);
+               drm_err(dev, "failed to create HLCDC outputs: %d\n", ret);
                return ret;
        }
 
        ret = atmel_hlcdc_create_planes(dev);
        if (ret) {
-               dev_err(dev->dev, "failed to create planes: %d\n", ret);
+               drm_err(dev, "failed to create planes: %d\n", ret);
                return ret;
        }
 
        ret = atmel_hlcdc_crtc_create(dev);
        if (ret) {
-               dev_err(dev->dev, "failed to create crtc\n");
+               drm_err(dev, "failed to create crtc\n");
                return ret;
        }
 
@@ -778,7 +778,7 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)
 
        ret = clk_prepare_enable(dc->hlcdc->periph_clk);
        if (ret) {
-               dev_err(dev->dev, "failed to enable periph_clk\n");
+               drm_err(dev, "failed to enable periph_clk\n");
                return ret;
        }
 
@@ -786,13 +786,13 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)
 
        ret = drm_vblank_init(dev, 1);
        if (ret < 0) {
-               dev_err(dev->dev, "failed to initialize vblank\n");
+               drm_err(dev, "failed to initialize vblank\n");
                goto err_periph_clk_disable;
        }
 
        ret = atmel_hlcdc_dc_modeset_init(dev);
        if (ret < 0) {
-               dev_err(dev->dev, "failed to initialize mode setting\n");
+               drm_err(dev, "failed to initialize mode setting\n");
                goto err_periph_clk_disable;
        }
 
@@ -802,7 +802,7 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)
        ret = atmel_hlcdc_dc_irq_install(dev, dc->hlcdc->irq);
        pm_runtime_put_sync(dev->dev);
        if (ret < 0) {
-               dev_err(dev->dev, "failed to install IRQ handler\n");
+               drm_err(dev, "failed to install IRQ handler\n");
                goto err_periph_clk_disable;
        }
 
index 50fee6a93964080ed6d3a62b37f7a3ffedeefe15..0b8a86afb0965ca3085dd5524983a0072199ec0b 100644 (file)
@@ -15,6 +15,7 @@
 #include <drm/drm_bridge.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_of.h>
+#include <drm/drm_print.h>
 #include <drm/drm_simple_kms_helper.h>
 
 #include "atmel_hlcdc_dc.h"
@@ -92,7 +93,7 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, int endpoint)
        output->bus_fmt = atmel_hlcdc_of_bus_fmt(ep);
        of_node_put(ep);
        if (output->bus_fmt < 0) {
-               dev_err(dev->dev, "endpoint %d: invalid bus width\n", endpoint);
+               drm_err(dev, "endpoint %d: invalid bus width\n", endpoint);
                return -EINVAL;
        }
 
index 59be5f64c058e2be398f207ad436f922135a5ad0..6dd38018b47fea4e018ecbf6b7bab5770ca54ae6 100644 (file)
@@ -1034,7 +1034,7 @@ static void atmel_hlcdc_irq_dbg(struct atmel_hlcdc_plane *plane,
        if (isr &
            (ATMEL_HLCDC_LAYER_OVR_IRQ(0) | ATMEL_HLCDC_LAYER_OVR_IRQ(1) |
             ATMEL_HLCDC_LAYER_OVR_IRQ(2)))
-               dev_dbg(plane->base.dev->dev, "overrun on plane %s\n",
+               drm_dbg(plane->base.dev, "overrun on plane %s\n",
                        desc->name);
 }
 
@@ -1051,7 +1051,7 @@ static void atmel_xlcdc_irq_dbg(struct atmel_hlcdc_plane *plane,
        if (isr &
            (ATMEL_XLCDC_LAYER_OVR_IRQ(0) | ATMEL_XLCDC_LAYER_OVR_IRQ(1) |
             ATMEL_XLCDC_LAYER_OVR_IRQ(2)))
-               dev_dbg(plane->base.dev->dev, "overrun on plane %s\n",
+               drm_dbg(plane->base.dev, "overrun on plane %s\n",
                        desc->name);
 }
 
@@ -1140,7 +1140,7 @@ static void atmel_hlcdc_plane_reset(struct drm_plane *p)
        if (state) {
                if (atmel_hlcdc_plane_alloc_dscrs(p, state)) {
                        kfree(state);
-                       dev_err(p->dev->dev,
+                       drm_err(p->dev,
                                "Failed to allocate initial plane state\n");
                        return;
                }