drm/ast: Rename AST_IO_INPUT_STATUS1_READ to AST_IO_VGAIR1_R

Rename AST_IO_INPUT_STATUS1_READ to AST_IO_VGAIR1_R to align naming
in the driver with documentation. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231017083653.10063-11-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index a8bcb1903294ee847e1670050224bd93d791900a..03f1edf95e73c292af4f00fc1917685f99054129 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -268,7 +268,7 @@ static inline bool __ast_gen_is_eq(struct ast_device *ast, unsigned long gen)
 #define AST_IO_VGAPDR                  (0x49)
 #define AST_IO_VGAGRI                  (0x4E)
 #define AST_IO_VGACRI                  (0x54)
-#define AST_IO_INPUT_STATUS1_READ      (0x5A)
+#define AST_IO_VGAIR1_R                        (0x5A)
 #define AST_IO_MISC_PORT_READ          (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 c4381342af04b51791ab84e2239e8659ffd25178..289e32227f6b952ef3535a2aa3942f3d4ce91449 100644 (file)
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -318,7 +318,7 @@ static void ast_set_std_reg(struct ast_device *ast,
                ast_set_index_reg(ast, AST_IO_VGACRI, i, stdtable->crtc[i]);
 
        /* set AR */
-       jreg = ast_io_read8(ast, AST_IO_INPUT_STATUS1_READ);
+       jreg = ast_io_read8(ast, AST_IO_VGAIR1_R);
        for (i = 0; i < 20; i++) {
                jreg = stdtable->ar[i];
                ast_io_write8(ast, AST_IO_VGAARI_W, (u8)i);
@@ -327,7 +327,7 @@ static void ast_set_std_reg(struct ast_device *ast,
        ast_io_write8(ast, AST_IO_VGAARI_W, 0x14);
        ast_io_write8(ast, AST_IO_VGAARI_W, 0x00);
 
-       jreg = ast_io_read8(ast, AST_IO_INPUT_STATUS1_READ);
+       jreg = ast_io_read8(ast, AST_IO_VGAIR1_R);
        ast_io_write8(ast, AST_IO_VGAARI_W, 0x20);
 
        /* Set GR */
@@ -558,7 +558,7 @@ static void ast_wait_for_vretrace(struct ast_device *ast)
        u8 vgair1;
 
        do {
-               vgair1 = ast_io_read8(ast, AST_IO_INPUT_STATUS1_READ);
+               vgair1 = ast_io_read8(ast, AST_IO_VGAIR1_R);
        } while (!(vgair1 & AST_IO_VGAIR1_VREFRESH) && time_before(jiffies, timeout));
 }