From: Thomas Zimmermann Date: Tue, 17 Oct 2023 08:32:07 +0000 (+0200) Subject: drm/ast: Rename AST_IO_MISC_PORT_READ to AST_IO_VGAMR_R X-Git-Tag: io_uring-6.7-2023-11-10~63^2~1^2~40 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8811bcbf28cc270aba8d0067bdb8f44c5cc5fad7;p=linux-block.git drm/ast: Rename AST_IO_MISC_PORT_READ to AST_IO_VGAMR_R Rename AST_IO_MISC_PORT_READ to AST_IO_VGAMR_R to align naming in the driver with documentation. No functional changes. Signed-off-by: Thomas Zimmermann Reviewed-by: Jocelyn Falempe Link: https://patchwork.freedesktop.org/patch/msgid/20231017083653.10063-12-tzimmermann@suse.de --- diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 03f1edf95e73..214bfac0798a 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -269,7 +269,7 @@ static inline bool __ast_gen_is_eq(struct ast_device *ast, unsigned long gen) #define AST_IO_VGAGRI (0x4E) #define AST_IO_VGACRI (0x54) #define AST_IO_VGAIR1_R (0x5A) -#define AST_IO_MISC_PORT_READ (0x4C) +#define AST_IO_VGAMR_R (0x4C) #define AST_IO_MM_OFFSET (0x380) diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 289e32227f6b..cb9614984285 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -531,7 +531,7 @@ static void ast_set_sync_reg(struct ast_device *ast, { u8 jreg; - jreg = ast_io_read8(ast, AST_IO_MISC_PORT_READ); + jreg = ast_io_read8(ast, AST_IO_VGAMR_R); jreg &= ~0xC0; if (vbios_mode->enh_table->flags & NVSync) jreg |= 0x80;