drm/sun4i: layers: Make atomic commit functions void

Functions called by atomic_commit callback should not fail. None of them
actually returns error, so make them void.

No functional change.

Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Ryan Walklin <ryan@testtoast.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://patch.msgid.link/20251104180942.61538-7-jernej.skrabec@gmail.com
Signed-off-by: Chen-Yu Tsai <wens@kernel.org>

diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index 75394b56d75fe6de49866e1db63a1789f831d737..3c86e890b06c047ae380ff5433b64ffcd95bdc7b 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -47,9 +47,9 @@ static void sun8i_ui_layer_update_alpha(struct sun8i_mixer *mixer, int channel,
                           mask, val);
 }
 
-static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
-                                      int overlay, struct drm_plane *plane,
-                                      unsigned int zpos)
+static void sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
+                                       int overlay, struct drm_plane *plane,
+                                       unsigned int zpos)
 {
        struct drm_plane_state *state = plane->state;
        u32 src_w, src_h, dst_w, dst_h;
@@ -125,12 +125,10 @@ static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
        regmap_write(bld_regs,
                     SUN8I_MIXER_BLEND_ATTR_INSIZE(bld_base, zpos),
                     outsize);
-
-       return 0;
 }
 
-static int sun8i_ui_layer_update_formats(struct sun8i_mixer *mixer, int channel,
-                                        int overlay, struct drm_plane *plane)
+static void sun8i_ui_layer_update_formats(struct sun8i_mixer *mixer, int channel,
+                                         int overlay, struct drm_plane *plane)
 {
        struct drm_plane_state *state = plane->state;
        const struct drm_format_info *fmt;
@@ -145,12 +143,10 @@ static int sun8i_ui_layer_update_formats(struct sun8i_mixer *mixer, int channel,
        regmap_update_bits(mixer->engine.regs,
                           SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ch_base, overlay),
                           SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_MASK, val);
-
-       return 0;
 }
 
-static int sun8i_ui_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
-                                       int overlay, struct drm_plane *plane)
+static void sun8i_ui_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
+                                        int overlay, struct drm_plane *plane)
 {
        struct drm_plane_state *state = plane->state;
        struct drm_framebuffer *fb = state->fb;
@@ -185,8 +181,6 @@ static int sun8i_ui_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
        regmap_write(mixer->engine.regs,
                     SUN8I_MIXER_CHAN_UI_LAYER_TOP_LADDR(ch_base, overlay),
                     lower_32_bits(dma_addr));
-
-       return 0;
 }
 
 static int sun8i_ui_layer_atomic_check(struct drm_plane *plane,

diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index bec92a3f31f976b5018d069a9c8d011342c2b82f..02e8ef1b137c4f64b60ff87d18a400c253ec1953 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -49,9 +49,9 @@ static void sun8i_vi_layer_update_alpha(struct sun8i_mixer *mixer, int channel,
        }
 }
 
-static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
-                                      int overlay, struct drm_plane *plane,
-                                      unsigned int zpos)
+static void sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
+                                       int overlay, struct drm_plane *plane,
+                                       unsigned int zpos)
 {
        struct drm_plane_state *state = plane->state;
        const struct drm_format_info *format = state->fb->format;
@@ -192,8 +192,6 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
        regmap_write(bld_regs,
                     SUN8I_MIXER_BLEND_ATTR_INSIZE(bld_base, zpos),
                     outsize);
-
-       return 0;
 }
 
 static u32 sun8i_vi_layer_get_csc_mode(const struct drm_format_info *format)
@@ -212,8 +210,8 @@ static u32 sun8i_vi_layer_get_csc_mode(const struct drm_format_info *format)
        }
 }
 
-static int sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
-                                        int overlay, struct drm_plane *plane)
+static void sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
+                                         int overlay, struct drm_plane *plane)
 {
        struct drm_plane_state *state = plane->state;
        u32 val, ch_base, csc_mode, hw_fmt;
@@ -247,12 +245,10 @@ static int sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
        regmap_update_bits(mixer->engine.regs,
                           SUN8I_MIXER_CHAN_VI_LAYER_ATTR(ch_base, overlay),
                           SUN8I_MIXER_CHAN_VI_LAYER_ATTR_RGB_MODE, val);
-
-       return 0;
 }
 
-static int sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
-                                       int overlay, struct drm_plane *plane)
+static void sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
+                                        int overlay, struct drm_plane *plane)
 {
        struct drm_plane_state *state = plane->state;
        struct drm_framebuffer *fb = state->fb;
@@ -306,8 +302,6 @@ static int sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
                                                                 overlay, i),
                             lower_32_bits(dma_addr));
        }
-
-       return 0;
 }
 
 static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,