diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-25 23:06:52 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-04-02 11:40:48 +0300 |
| commit | 0872fee2e1c8a0503006b5dab0ec32901b0bf247 (patch) | |
| tree | ffa3f039dfda9bf043d13dd5c5b3021990e037e8 | |
| parent | 42f4980da575ffbb1ff73bd8ffdd79662a23e8f6 (diff) | |
| download | linux-0872fee2e1c8a0503006b5dab0ec32901b0bf247.tar.xz | |
drm/ast: Pass AST device to ast_ddc_create()
The DDC code needs the AST device. Pass it to ast_ddc_create() and
avoid an internal upcast. Improves type safety within the DDC code.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sui Jingfeng <sui.jingfeng@linux.dev>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240325200855.21150-8-tzimmermann@suse.de
| -rw-r--r-- | drivers/gpu/drm/ast/ast_ddc.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/ast/ast_ddc.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/ast/ast_mode.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/ast/ast_ddc.c b/drivers/gpu/drm/ast/ast_ddc.c index c0e5d03c028d..24b7d589f0d4 100644 --- a/drivers/gpu/drm/ast/ast_ddc.c +++ b/drivers/gpu/drm/ast/ast_ddc.c @@ -110,8 +110,9 @@ static void ast_ddc_release(struct drm_device *dev, void *res) i2c_del_adapter(&ddc->adapter); } -struct ast_ddc *ast_ddc_create(struct drm_device *dev) +struct ast_ddc *ast_ddc_create(struct ast_device *ast) { + struct drm_device *dev = &ast->base; struct ast_ddc *ddc; struct i2c_adapter *adapter; struct i2c_algo_bit_data *bit; diff --git a/drivers/gpu/drm/ast/ast_ddc.h b/drivers/gpu/drm/ast/ast_ddc.h index 071f9be3e27d..d423b144a345 100644 --- a/drivers/gpu/drm/ast/ast_ddc.h +++ b/drivers/gpu/drm/ast/ast_ddc.h @@ -6,6 +6,7 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> +struct ast_device; struct drm_device; struct ast_ddc { @@ -14,6 +15,6 @@ struct ast_ddc { struct i2c_algo_bit_data bit; }; -struct ast_ddc *ast_ddc_create(struct drm_device *dev); +struct ast_ddc *ast_ddc_create(struct ast_device *ast); #endif diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 40cb495acc90..fc73d3b65b2a 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1388,10 +1388,11 @@ static const struct drm_connector_funcs ast_vga_connector_funcs = { static int ast_vga_connector_init(struct drm_device *dev, struct drm_connector *connector) { + struct ast_device *ast = to_ast_device(dev); struct ast_ddc *ddc; int ret; - ddc = ast_ddc_create(dev); + ddc = ast_ddc_create(ast); if (IS_ERR(ddc)) { ret = PTR_ERR(ddc); drm_err(dev, "failed to add DDC bus for connector; ret=%d\n", ret); @@ -1485,10 +1486,11 @@ static const struct drm_connector_funcs ast_sil164_connector_funcs = { static int ast_sil164_connector_init(struct drm_device *dev, struct drm_connector *connector) { + struct ast_device *ast = to_ast_device(dev); struct ast_ddc *ddc; int ret; - ddc = ast_ddc_create(dev); + ddc = ast_ddc_create(ast); if (IS_ERR(ddc)) { ret = PTR_ERR(ddc); drm_err(dev, "failed to add DDC bus for connector; ret=%d\n", ret); |