drm/ast: Rename to_ast_private() to to_ast_device()

The helper to_ast_private() now upcasts to struct ast_device. Rename
it accordingly. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230221155745.27484-5-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c
index 9e34297d836d0a8ff92888f49322be08bab4d8db..fbb070f63e36b8656bedfadea9b629dbad310f20 100644 (file)
--- a/drivers/gpu/drm/ast/ast_dp.c
+++ b/drivers/gpu/drm/ast/ast_dp.c
@@ -9,7 +9,7 @@
 
 int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u8 i = 0, j = 0;
 
        /*
@@ -125,7 +125,7 @@ void ast_dp_launch(struct drm_device *dev, u8 bPower)
        u8 bDPTX = 0;
        u8 bDPExecute = 1;
 
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        // S3 come back, need more time to wait BMC ready.
        if (bPower)
                WaitCount = 300;
@@ -172,7 +172,7 @@ void ast_dp_launch(struct drm_device *dev, u8 bPower)
 
 void ast_dp_power_on_off(struct drm_device *dev, bool on)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        // Read and Turn off DP PHY sleep
        u8 bE3 = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xE3, AST_DP_VIDEO_ENABLE);
 
@@ -188,7 +188,7 @@ void ast_dp_power_on_off(struct drm_device *dev, bool on)
 
 void ast_dp_set_on_off(struct drm_device *dev, bool on)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u8 video_on_off = on;
 
        // Video On/Off
@@ -208,7 +208,7 @@ void ast_dp_set_on_off(struct drm_device *dev, bool on)
 
 void ast_dp_set_mode(struct drm_crtc *crtc, struct ast_vbios_mode_info *vbios_mode)
 {
-       struct ast_device *ast = to_ast_private(crtc->dev);
+       struct ast_device *ast = to_ast_device(crtc->dev);
 
        u32 ulRefreshRateIndex;
        u8 ModeIdx;

diff --git a/drivers/gpu/drm/ast/ast_dp501.c b/drivers/gpu/drm/ast/ast_dp501.c
index bb56a1c7396870d01cb2c26099c1ca5a4087d633..1bc35a992369d745ce74d9f3b84bb8030e27081b 100644 (file)
--- a/drivers/gpu/drm/ast/ast_dp501.c
+++ b/drivers/gpu/drm/ast/ast_dp501.c
@@ -18,7 +18,7 @@ static void ast_release_firmware(void *data)
 
 static int ast_load_dp501_microcode(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        int ret;
 
        ret = request_firmware(&ast->dp501_fw, "ast_dp501_fw.bin", dev->dev);
@@ -106,7 +106,7 @@ static bool wait_fw_ready(struct ast_device *ast)
 
 static bool ast_write_cmd(struct drm_device *dev, u8 data)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        int retry = 0;
        if (wait_nack(ast)) {
                send_nack(ast);
@@ -128,7 +128,7 @@ static bool ast_write_cmd(struct drm_device *dev, u8 data)
 
 static bool ast_write_data(struct drm_device *dev, u8 data)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
 
        if (wait_nack(ast)) {
                send_nack(ast);
@@ -146,7 +146,7 @@ static bool ast_write_data(struct drm_device *dev, u8 data)
 #if 0
 static bool ast_read_data(struct drm_device *dev, u8 *data)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u8 tmp;
 
        *data = 0;
@@ -185,7 +185,7 @@ static u32 get_fw_base(struct ast_device *ast)
 
 bool ast_backup_fw(struct drm_device *dev, u8 *addr, u32 size)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u32 i, data;
        u32 boot_address;
 
@@ -204,7 +204,7 @@ bool ast_backup_fw(struct drm_device *dev, u8 *addr, u32 size)
 
 static bool ast_launch_m68k(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u32 i, data, len = 0;
        u32 boot_address;
        u8 *fw_addr = NULL;
@@ -274,7 +274,7 @@ static bool ast_launch_m68k(struct drm_device *dev)
 
 bool ast_dp501_read_edid(struct drm_device *dev, u8 *ediddata)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u32 i, boot_address, offset, data;
        u32 *pEDIDidx;
 
@@ -334,7 +334,7 @@ bool ast_dp501_read_edid(struct drm_device *dev, u8 *ediddata)
 
 static bool ast_init_dvo(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u8 jreg;
        u32 data;
        ast_write32(ast, 0xf004, 0x1e6e0000);
@@ -407,7 +407,7 @@ static bool ast_init_dvo(struct drm_device *dev)
 
 static void ast_init_analog(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u32 data;
 
        /*
@@ -434,7 +434,7 @@ static void ast_init_analog(struct drm_device *dev)
 
 void ast_init_3rdtx(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u8 jreg;
 
        if (ast->chip == AST2300 || ast->chip == AST2400) {

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index cf43270194684b013745f7fe714b8b98be7ff909..a501169cddad890c0c845cf9217d8b517e16af94 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -210,7 +210,7 @@ struct ast_device {
        const struct firmware *dp501_fw;        /* dp501 fw */
 };
 
-static inline struct ast_device *to_ast_private(struct drm_device *dev)
+static inline struct ast_device *to_ast_device(struct drm_device *dev)
 {
        return container_of(dev, struct ast_device, base);
 }

diff --git a/drivers/gpu/drm/ast/ast_i2c.c b/drivers/gpu/drm/ast/ast_i2c.c
index 50a5d93ff0f89410a357dde1abcf37e09234ff72..d64045c0b84959f9cdaa009e6054de05e3e2d7d2 100644 (file)
--- a/drivers/gpu/drm/ast/ast_i2c.c
+++ b/drivers/gpu/drm/ast/ast_i2c.c
@@ -29,7 +29,7 @@
 static void ast_i2c_setsda(void *i2c_priv, int data)
 {
        struct ast_i2c_chan *i2c = i2c_priv;
-       struct ast_device *ast = to_ast_private(i2c->dev);
+       struct ast_device *ast = to_ast_device(i2c->dev);
        int i;
        u8 ujcrb7, jtemp;
 
@@ -45,7 +45,7 @@ static void ast_i2c_setsda(void *i2c_priv, int data)
 static void ast_i2c_setscl(void *i2c_priv, int clock)
 {
        struct ast_i2c_chan *i2c = i2c_priv;
-       struct ast_device *ast = to_ast_private(i2c->dev);
+       struct ast_device *ast = to_ast_device(i2c->dev);
        int i;
        u8 ujcrb7, jtemp;
 
@@ -61,7 +61,7 @@ static void ast_i2c_setscl(void *i2c_priv, int clock)
 static int ast_i2c_getsda(void *i2c_priv)
 {
        struct ast_i2c_chan *i2c = i2c_priv;
-       struct ast_device *ast = to_ast_private(i2c->dev);
+       struct ast_device *ast = to_ast_device(i2c->dev);
        uint32_t val, val2, count, pass;
 
        count = 0;
@@ -83,7 +83,7 @@ static int ast_i2c_getsda(void *i2c_priv)
 static int ast_i2c_getscl(void *i2c_priv)
 {
        struct ast_i2c_chan *i2c = i2c_priv;
-       struct ast_device *ast = to_ast_private(i2c->dev);
+       struct ast_device *ast = to_ast_device(i2c->dev);
        uint32_t val, val2, count, pass;
 
        count = 0;

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index 6def35a326d65c8bc94de484fc00f89698fd08e4..794ffd4a29c5ac47a724723312692b6514c39f55 100644 (file)
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -66,7 +66,7 @@ uint8_t ast_get_index_reg_mask(struct ast_device *ast,
 static void ast_detect_config_mode(struct drm_device *dev, u32 *scu_rev)
 {
        struct device_node *np = dev->dev->of_node;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct pci_dev *pdev = to_pci_dev(dev->dev);
        uint32_t data, jregd0, jregd1;
 
@@ -122,7 +122,7 @@ static void ast_detect_config_mode(struct drm_device *dev, u32 *scu_rev)
 
 static int ast_detect_chip(struct drm_device *dev, bool *need_post)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct pci_dev *pdev = to_pci_dev(dev->dev);
        uint32_t jreg, scu_rev;
 
@@ -271,7 +271,7 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
 static int ast_get_dram_info(struct drm_device *dev)
 {
        struct device_node *np = dev->dev->of_node;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        uint32_t mcr_cfg, mcr_scu_mpll, mcr_scu_strap;
        uint32_t denum, num, div, ref_pll, dsel;
 

diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index d18f365adc76b9b41aaccacab7c697f5a0790b56..b0292b79d2c806a2dfd878843584664daadf5026 100644 (file)
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -645,7 +645,7 @@ static void ast_primary_plane_helper_atomic_update(struct drm_plane *plane,
                                                   struct drm_atomic_state *state)
 {
        struct drm_device *dev = plane->dev;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
        struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
        struct drm_framebuffer *fb = plane_state->fb;
@@ -683,7 +683,7 @@ static void ast_primary_plane_helper_atomic_update(struct drm_plane *plane,
 static void ast_primary_plane_helper_atomic_enable(struct drm_plane *plane,
                                                   struct drm_atomic_state *state)
 {
-       struct ast_device *ast = to_ast_private(plane->dev);
+       struct ast_device *ast = to_ast_device(plane->dev);
        struct ast_plane *ast_plane = to_ast_plane(plane);
 
        /*
@@ -699,7 +699,7 @@ static void ast_primary_plane_helper_atomic_enable(struct drm_plane *plane,
 static void ast_primary_plane_helper_atomic_disable(struct drm_plane *plane,
                                                    struct drm_atomic_state *state)
 {
-       struct ast_device *ast = to_ast_private(plane->dev);
+       struct ast_device *ast = to_ast_device(plane->dev);
 
        ast_set_index_reg_mask(ast, AST_IO_SEQ_PORT, 0x1, 0xdf, 0x20);
 }
@@ -888,7 +888,7 @@ static void ast_cursor_plane_helper_atomic_update(struct drm_plane *plane,
        struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
        struct drm_framebuffer *fb = plane_state->fb;
        struct drm_plane_state *old_plane_state = drm_atomic_get_old_plane_state(state, plane);
-       struct ast_device *ast = to_ast_private(plane->dev);
+       struct ast_device *ast = to_ast_device(plane->dev);
        struct iosys_map src_map = shadow_plane_state->data[0];
        struct drm_rect damage;
        const u8 *src = src_map.vaddr; /* TODO: Use mapping abstraction properly */
@@ -943,7 +943,7 @@ static void ast_cursor_plane_helper_atomic_update(struct drm_plane *plane,
 static void ast_cursor_plane_helper_atomic_disable(struct drm_plane *plane,
                                                   struct drm_atomic_state *state)
 {
-       struct ast_device *ast = to_ast_private(plane->dev);
+       struct ast_device *ast = to_ast_device(plane->dev);
 
        ast_set_cursor_enabled(ast, false);
 }
@@ -1007,7 +1007,7 @@ static int ast_cursor_plane_init(struct ast_device *ast)
 
 static void ast_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
-       struct ast_device *ast = to_ast_private(crtc->dev);
+       struct ast_device *ast = to_ast_device(crtc->dev);
        u8 ch = AST_DPMS_VSYNC_OFF | AST_DPMS_HSYNC_OFF;
        struct ast_crtc_state *ast_state;
        const struct drm_format_info *format;
@@ -1064,7 +1064,7 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode)
 static enum drm_mode_status
 ast_crtc_helper_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
 {
-       struct ast_device *ast = to_ast_private(crtc->dev);
+       struct ast_device *ast = to_ast_device(crtc->dev);
        enum drm_mode_status status;
        uint32_t jtemp;
 
@@ -1189,7 +1189,7 @@ ast_crtc_helper_atomic_flush(struct drm_crtc *crtc,
        struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
                                                                          crtc);
        struct drm_device *dev = crtc->dev;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct ast_crtc_state *ast_crtc_state = to_ast_crtc_state(crtc_state);
        struct ast_vbios_mode_info *vbios_mode_info = &ast_crtc_state->vbios_mode_info;
 
@@ -1214,7 +1214,7 @@ ast_crtc_helper_atomic_flush(struct drm_crtc *crtc,
 static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state)
 {
        struct drm_device *dev = crtc->dev;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
        struct ast_crtc_state *ast_crtc_state = to_ast_crtc_state(crtc_state);
        struct ast_vbios_mode_info *vbios_mode_info =
@@ -1236,7 +1236,7 @@ static void ast_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_ato
 {
        struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
        struct drm_device *dev = crtc->dev;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
 
        ast_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
 
@@ -1324,7 +1324,7 @@ static const struct drm_crtc_funcs ast_crtc_funcs = {
 
 static int ast_crtc_init(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct drm_crtc *crtc = &ast->crtc;
        int ret;
 
@@ -1350,7 +1350,7 @@ static int ast_vga_connector_helper_get_modes(struct drm_connector *connector)
 {
        struct ast_vga_connector *ast_vga_connector = to_ast_vga_connector(connector);
        struct drm_device *dev = connector->dev;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct edid *edid;
        int count;
 
@@ -1456,7 +1456,7 @@ static int ast_sil164_connector_helper_get_modes(struct drm_connector *connector
 {
        struct ast_sil164_connector *ast_sil164_connector = to_ast_sil164_connector(connector);
        struct drm_device *dev = connector->dev;
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct edid *edid;
        int count;
 
@@ -1733,7 +1733,7 @@ static int ast_astdp_output_init(struct ast_device *ast)
 
 static void ast_mode_config_helper_atomic_commit_tail(struct drm_atomic_state *state)
 {
-       struct ast_device *ast = to_ast_private(state->dev);
+       struct ast_device *ast = to_ast_device(state->dev);
 
        /*
         * Concurrent operations could possibly trigger a call to
@@ -1754,7 +1754,7 @@ static enum drm_mode_status ast_mode_config_mode_valid(struct drm_device *dev,
                                                       const struct drm_display_mode *mode)
 {
        static const unsigned long max_bpp = 4; /* DRM_FORMAT_XRGB8888 */
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        unsigned long fbsize, fbpages, max_fbpages;
 
        max_fbpages = (ast->vram_fb_available) >> PAGE_SHIFT;

diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 9b6e2988bc3bc64aa06382f72b7b40d6a50b62ad..71bb36b865fdac627ac846ac210d7d1f3c0da5e4 100644 (file)
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -39,7 +39,7 @@ static void ast_post_chip_2500(struct drm_device *dev);
 
 void ast_enable_vga(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(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);
@@ -47,7 +47,7 @@ void ast_enable_vga(struct drm_device *dev)
 
 void ast_enable_mmio(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
 
        ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x06);
 }
@@ -55,7 +55,7 @@ void ast_enable_mmio(struct drm_device *dev)
 
 bool ast_is_vga_enabled(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u8 ch;
 
        ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT);
@@ -70,7 +70,7 @@ static const u8 extreginfo_ast2300[] = { 0x0f, 0x04, 0x1f, 0xff };
 static void
 ast_set_def_ext_reg(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct pci_dev *pdev = to_pci_dev(dev->dev);
        u8 i, index, reg;
        const u8 *ext_reg_info;
@@ -273,7 +273,7 @@ cbr_start:
 
 static void ast_init_dram_reg(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u8 j;
        u32 data, temp, i;
        const struct ast_dramstruct *dram_reg_info;
@@ -366,7 +366,7 @@ static void ast_init_dram_reg(struct drm_device *dev)
 
 void ast_post_gpu(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct pci_dev *pdev = to_pci_dev(dev->dev);
        u32 reg;
 
@@ -1600,7 +1600,7 @@ ddr2_init_start:
 
 static void ast_post_chip_2300(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        struct ast2300_dram_param param;
        u32 temp;
        u8 reg;
@@ -2066,7 +2066,7 @@ void ast_patch_ahb_2500(struct ast_device *ast)
 
 void ast_post_chip_2500(struct drm_device *dev)
 {
-       struct ast_device *ast = to_ast_private(dev);
+       struct ast_device *ast = to_ast_device(dev);
        u32 temp;
        u8 reg;