drm/ast: Pass struct ast_private instance to cursor init/fini functions

Removes some typecasting.

v2:
	* use to_ast_private() instead of struct drm_device.dev_private

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200702115029.5281-3-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/ast/ast_cursor.c b/drivers/gpu/drm/ast/ast_cursor.c
index 53bb6eebc7cdd6bfd9a677668bff362868ac5fdf..1d4f51a7fe22dfce151c78a6c7ddb9fabd2c9470 100644 (file)
--- a/drivers/gpu/drm/ast/ast_cursor.c
+++ b/drivers/gpu/drm/ast/ast_cursor.c
@@ -34,9 +34,9 @@
 /*
  * Allocate cursor BOs and pins them at the end of VRAM.
  */
-int ast_cursor_init(struct drm_device *dev)
+int ast_cursor_init(struct ast_private *ast)
 {
-       struct ast_private *ast = to_ast_private(dev);
+       struct drm_device *dev = ast->dev;
        size_t size, i;
        struct drm_gem_vram_object *gbo;
        int ret;
@@ -72,9 +72,8 @@ err_drm_gem_vram_put:
        return ret;
 }
 
-void ast_cursor_fini(struct drm_device *dev)
+void ast_cursor_fini(struct ast_private *ast)
 {
-       struct ast_private *ast = to_ast_private(dev);
        size_t i;
        struct drm_gem_vram_object *gbo;
 

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 245ed2e2d77534ba005d475c62d62b59a1bf421e..f7b120f862a85316dc17f031e272b3c7119ff15d 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -316,8 +316,8 @@ void ast_init_3rdtx(struct drm_device *dev);
 void ast_release_firmware(struct drm_device *dev);
 
 /* ast_cursor.c */
-int ast_cursor_init(struct drm_device *dev);
-void ast_cursor_fini(struct drm_device *dev);
+int ast_cursor_init(struct ast_private *ast);
+void ast_cursor_fini(struct ast_private *ast);
 int ast_cursor_update(void *dst, void *src, unsigned int width,
                      unsigned int height);
 void ast_cursor_set_base(struct ast_private *ast, u64 address);

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index c8399699d773ab4a4e02fbf899e1c9655714606e..e69965f5636d8319baa721f11b60ad4e891a6b5f 100644 (file)
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -1149,7 +1149,7 @@ int ast_mode_init(struct drm_device *dev)
        drm_plane_helper_add(&ast->cursor_plane,
                             &ast_cursor_plane_helper_funcs);
 
-       ast_cursor_init(dev);
+       ast_cursor_init(ast);
        ast_crtc_init(dev);
        ast_encoder_init(dev);
        ast_connector_init(dev);
@@ -1159,7 +1159,9 @@ int ast_mode_init(struct drm_device *dev)
 
 void ast_mode_fini(struct drm_device *dev)
 {
-       ast_cursor_fini(dev);
+       struct ast_private *ast = to_ast_private(dev);
+
+       ast_cursor_fini(ast);
 }
 
 static int get_clock(void *i2c_priv)