Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/ast: Define struct ast_ddc in ast_ddc.c
Move the definition of struct ast_ddc to ast_ddc.c and return the i2c
adapter from ast_ddc_create(). Update callers accordingly. Avoids
including Linux i2c header files, except where required. 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/20240403103325.30457-4-tzimmermann@suse.de
+18
-17
+12
-2
drivers/gpu/drm/ast/ast_ddc.c
+12
-2
drivers/gpu/drm/ast/ast_ddc.c
···
21
21
* of the Software.
22
22
*/
23
23
24
+
#include <linux/i2c-algo-bit.h>
25
+
#include <linux/i2c.h>
26
+
24
27
#include <drm/drm_managed.h>
25
28
#include <drm/drm_print.h>
26
29
27
30
#include "ast_ddc.h"
28
31
#include "ast_drv.h"
32
+
33
+
struct ast_ddc {
34
+
struct ast_device *ast;
35
+
36
+
struct i2c_algo_bit_data bit;
37
+
struct i2c_adapter adapter;
38
+
};
29
39
30
40
static void ast_ddc_algo_bit_data_setsda(void *data, int state)
31
41
{
···
142
132
i2c_del_adapter(&ddc->adapter);
143
133
}
144
134
145
-
struct ast_ddc *ast_ddc_create(struct ast_device *ast)
135
+
struct i2c_adapter *ast_ddc_create(struct ast_device *ast)
146
136
{
147
137
struct drm_device *dev = &ast->base;
148
138
struct ast_ddc *ddc;
···
183
173
if (ret)
184
174
return ERR_PTR(ret);
185
175
186
-
return ddc;
176
+
return &ddc->adapter;
187
177
}
+2
-11
drivers/gpu/drm/ast/ast_ddc.h
+2
-11
drivers/gpu/drm/ast/ast_ddc.h
···
3
3
#ifndef __AST_DDC_H__
4
4
#define __AST_DDC_H__
5
5
6
-
#include <linux/i2c.h>
7
-
#include <linux/i2c-algo-bit.h>
8
-
9
6
struct ast_device;
7
+
struct i2c_adapter;
10
8
11
-
struct ast_ddc {
12
-
struct ast_device *ast;
13
-
14
-
struct i2c_adapter adapter;
15
-
struct i2c_algo_bit_data bit;
16
-
};
17
-
18
-
struct ast_ddc *ast_ddc_create(struct ast_device *ast);
9
+
struct i2c_adapter *ast_ddc_create(struct ast_device *ast);
19
10
20
11
#endif
+4
-4
drivers/gpu/drm/ast/ast_mode.c
+4
-4
drivers/gpu/drm/ast/ast_mode.c
···
1360
1360
static int ast_vga_connector_init(struct drm_device *dev, struct drm_connector *connector)
1361
1361
{
1362
1362
struct ast_device *ast = to_ast_device(dev);
1363
-
struct ast_ddc *ddc;
1363
+
struct i2c_adapter *ddc;
1364
1364
int ret;
1365
1365
1366
1366
ddc = ast_ddc_create(ast);
···
1371
1371
}
1372
1372
1373
1373
ret = drm_connector_init_with_ddc(dev, connector, &ast_vga_connector_funcs,
1374
-
DRM_MODE_CONNECTOR_VGA, &ddc->adapter);
1374
+
DRM_MODE_CONNECTOR_VGA, ddc);
1375
1375
if (ret)
1376
1376
return ret;
1377
1377
···
1429
1429
static int ast_sil164_connector_init(struct drm_device *dev, struct drm_connector *connector)
1430
1430
{
1431
1431
struct ast_device *ast = to_ast_device(dev);
1432
-
struct ast_ddc *ddc;
1432
+
struct i2c_adapter *ddc;
1433
1433
int ret;
1434
1434
1435
1435
ddc = ast_ddc_create(ast);
···
1440
1440
}
1441
1441
1442
1442
ret = drm_connector_init_with_ddc(dev, connector, &ast_sil164_connector_funcs,
1443
-
DRM_MODE_CONNECTOR_DVII, &ddc->adapter);
1443
+
DRM_MODE_CONNECTOR_DVII, ddc);
1444
1444
if (ret)
1445
1445
return ret;
1446
1446