Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

OMAPDSS: reorder uninit calls

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>

+16 -16
+16 -16
drivers/video/fbdev/omap2/dss/core.c
··· 269 269 }; 270 270 271 271 static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = { 272 - #ifdef CONFIG_OMAP2_DSS_DSI 273 - dsi_uninit_platform_driver, 274 - #endif 275 - #ifdef CONFIG_OMAP2_DSS_DPI 276 - dpi_uninit_platform_driver, 277 - #endif 278 - #ifdef CONFIG_OMAP2_DSS_SDI 279 - sdi_uninit_platform_driver, 280 - #endif 281 - #ifdef CONFIG_OMAP2_DSS_RFBI 282 - rfbi_uninit_platform_driver, 283 - #endif 284 - #ifdef CONFIG_OMAP2_DSS_VENC 285 - venc_uninit_platform_driver, 272 + #ifdef CONFIG_OMAP5_DSS_HDMI 273 + hdmi5_uninit_platform_driver, 286 274 #endif 287 275 #ifdef CONFIG_OMAP4_DSS_HDMI 288 276 hdmi4_uninit_platform_driver, 289 277 #endif 290 - #ifdef CONFIG_OMAP5_DSS_HDMI 291 - hdmi5_uninit_platform_driver, 278 + #ifdef CONFIG_OMAP2_DSS_VENC 279 + venc_uninit_platform_driver, 280 + #endif 281 + #ifdef CONFIG_OMAP2_DSS_RFBI 282 + rfbi_uninit_platform_driver, 283 + #endif 284 + #ifdef CONFIG_OMAP2_DSS_SDI 285 + sdi_uninit_platform_driver, 286 + #endif 287 + #ifdef CONFIG_OMAP2_DSS_DPI 288 + dpi_uninit_platform_driver, 289 + #endif 290 + #ifdef CONFIG_OMAP2_DSS_DSI 291 + dsi_uninit_platform_driver, 292 292 #endif 293 293 }; 294 294