[PATCH 02/12] drm/ast: Rename AST_IO_MISC_PORT_WRITE to AST_IO_VGAMR_W

Thomas Zimmermann tzimmermann at suse.de
Tue Oct 17 08:31:58 UTC 2023


Rename AST_IO_MISC_PORT_WRITE to AST_IO_VGAMR_W to align naming
in the driver with documentation. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
---
 drivers/gpu/drm/ast/ast_drv.h  | 2 +-
 drivers/gpu/drm/ast/ast_main.c | 2 +-
 drivers/gpu/drm/ast/ast_mode.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 3d64dc356d699..ff86db3604cda 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -260,7 +260,7 @@ static inline bool __ast_gen_is_eq(struct ast_device *ast, unsigned long gen)
 #define IS_AST_GEN7(__ast)	__ast_gen_is_eq(__ast, 7)
 
 #define AST_IO_VGAARI_W			(0x40)
-#define AST_IO_MISC_PORT_WRITE		(0x42)
+#define AST_IO_VGAMR_W			(0x42)
 #define AST_IO_VGA_ENABLE_PORT		(0x43)
 #define AST_IO_SEQ_PORT			(0x44)
 #define AST_IO_DAC_INDEX_READ		(0x47)
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index dae365ed39696..f8a682c4cbd01 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -50,7 +50,7 @@ static void ast_enable_vga(struct drm_device *dev)
 	struct ast_device *ast = to_ast_device(dev);
 
 	ast_io_write8(ast, AST_IO_VGA_ENABLE_PORT, 0x01);
-	ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, 0x01);
+	ast_io_write8(ast, AST_IO_VGAMR_W, 0x01);
 }
 
 /*
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 1ccbfdf27356e..3f52648c20a09 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -298,7 +298,7 @@ static void ast_set_std_reg(struct ast_device *ast,
 	stdtable = vbios_mode->std_table;
 
 	jreg = stdtable->misc;
-	ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg);
+	ast_io_write8(ast, AST_IO_VGAMR_W, jreg);
 
 	/* Set SEQ; except Screen Disable field */
 	ast_set_index_reg(ast, AST_IO_SEQ_PORT, 0x00, 0x03);
@@ -537,7 +537,7 @@ static void ast_set_sync_reg(struct ast_device *ast,
 		jreg |= 0x80;
 	if (vbios_mode->enh_table->flags & NHSync)
 		jreg |= 0x40;
-	ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, jreg);
+	ast_io_write8(ast, AST_IO_VGAMR_W, jreg);
 }
 
 static void ast_set_start_address_crt1(struct ast_device *ast,
-- 
2.42.0



More information about the dri-devel mailing list