iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OMAPDSS: simplify submodule reg/unreg code

Browse Source 
Now that we are using components in omapdss, there's no need for
separate handling of dss and dispc driver init. Thus we can move the dss
and dispc init and unit func pointers to the lists we use for the other
dss submodules.

We can now also handle errors returned by the registration functions
properly: if registering a driver fails, we can stop processing and
return the error.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen 2015-06-04 14:44:49 +03:00
parent 736e60ddc2
commit ad4eaef7ba
1 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/video/fbdev/omap2/dss/core.c
View File

@ -245,6 +245,8 @@ static struct platform_driver omap_dss_driver = {
/* INIT */ /* INIT */
static int (*dss_output_drv_reg_funcs[])(void) __initdata = { static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
dss_init_platform_driver,
dispc_init_platform_driver,
#ifdef CONFIG_OMAP2_DSS_DSI #ifdef CONFIG_OMAP2_DSS_DSI
dsi_init_platform_driver, dsi_init_platform_driver,
#endif #endif
@ -268,7 +270,7 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
#endif #endif
}; };
static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = { static void (*dss_output_drv_unreg_funcs[])(void) = {
#ifdef CONFIG_OMAP5_DSS_HDMI #ifdef CONFIG_OMAP5_DSS_HDMI
hdmi5_uninit_platform_driver, hdmi5_uninit_platform_driver,
#endif #endif
@ -290,10 +292,10 @@ static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = {
#ifdef CONFIG_OMAP2_DSS_DSI #ifdef CONFIG_OMAP2_DSS_DSI
dsi_uninit_platform_driver, dsi_uninit_platform_driver,
#endif #endif
dispc_uninit_platform_driver,
dss_uninit_platform_driver,
}; };
static bool dss_output_drv_loaded[ARRAY_SIZE(dss_output_drv_reg_funcs)];
static int __init omap_dss_init(void) static int __init omap_dss_init(void)
{ {
int r; int r;
@ -303,33 +305,20 @@ static int __init omap_dss_init(void)
if (r) if (r)
return r; return r;
r = dss_init_platform_driver();
if (r) {
DSSERR("Failed to initialize DSS platform driver\n");
goto err_dss;
}
r = dispc_init_platform_driver();
if (r) {
DSSERR("Failed to initialize dispc platform driver\n");
goto err_dispc;
}
/*
* It's ok if the output-driver register fails. It happens, for example,
* when there is no output-device (e.g. SDI for OMAP4).
*/
for (i = 0; i < ARRAY_SIZE(dss_output_drv_reg_funcs); ++i) { for (i = 0; i < ARRAY_SIZE(dss_output_drv_reg_funcs); ++i) {
r = dss_output_drv_reg_funcs[i](); r = dss_output_drv_reg_funcs[i]();
if (r == 0) if (r)
dss_output_drv_loaded[i] = true; goto err_reg;
} }
return 0; return 0;
err_dispc: err_reg:
dss_uninit_platform_driver(); for (i = ARRAY_SIZE(dss_output_drv_reg_funcs) - i;
err_dss: i < ARRAY_SIZE(dss_output_drv_reg_funcs);
++i)
dss_output_drv_unreg_funcs[i]();
platform_driver_unregister(&omap_dss_driver); platform_driver_unregister(&omap_dss_driver);
return r; return r;
@ -339,13 +328,8 @@ static void __exit omap_dss_exit(void)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(dss_output_drv_unreg_funcs); ++i) { for (i = 0; i < ARRAY_SIZE(dss_output_drv_unreg_funcs); ++i)
if (dss_output_drv_loaded[i]) dss_output_drv_unreg_funcs[i]();
dss_output_drv_unreg_funcs[i]();
}
dispc_uninit_platform_driver();
dss_uninit_platform_driver();
platform_driver_unregister(&omap_dss_driver); platform_driver_unregister(&omap_dss_driver);
} }