OMAPDSS: reorder uninit calls
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 4 Jun 2015 11:31:36 +0000 (14:31 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 17 Jun 2015 10:44:50 +0000 (13:44 +0300)
We have a list of function pointers to dss submodule uninit functions.
It makes sense to do the uninit in the reverse order to init, but that
is not currently the case.

This patch reorders the uninit calls to be the reverse of init order.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
drivers/video/fbdev/omap2/dss/core.c

index 57b6a5296c8722eff3148797e93e5d16aa543787..5c64515de81827260cba7b8f59ca02b8f226310d 100644 (file)
@@ -269,26 +269,26 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
 };
 
 static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = {
-#ifdef CONFIG_OMAP2_DSS_DSI
-       dsi_uninit_platform_driver,
+#ifdef CONFIG_OMAP5_DSS_HDMI
+       hdmi5_uninit_platform_driver,
 #endif
-#ifdef CONFIG_OMAP2_DSS_DPI
-       dpi_uninit_platform_driver,
+#ifdef CONFIG_OMAP4_DSS_HDMI
+       hdmi4_uninit_platform_driver,
 #endif
-#ifdef CONFIG_OMAP2_DSS_SDI
-       sdi_uninit_platform_driver,
+#ifdef CONFIG_OMAP2_DSS_VENC
+       venc_uninit_platform_driver,
 #endif
 #ifdef CONFIG_OMAP2_DSS_RFBI
        rfbi_uninit_platform_driver,
 #endif
-#ifdef CONFIG_OMAP2_DSS_VENC
-       venc_uninit_platform_driver,
+#ifdef CONFIG_OMAP2_DSS_SDI
+       sdi_uninit_platform_driver,
 #endif
-#ifdef CONFIG_OMAP4_DSS_HDMI
-       hdmi4_uninit_platform_driver,
+#ifdef CONFIG_OMAP2_DSS_DPI
+       dpi_uninit_platform_driver,
 #endif
-#ifdef CONFIG_OMAP5_DSS_HDMI
-       hdmi5_uninit_platform_driver,
+#ifdef CONFIG_OMAP2_DSS_DSI
+       dsi_uninit_platform_driver,
 #endif
 };