drm/omap: convert dss_mgr_unregister_framedone_handler to accept omap_channel

We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_unregister_framedone_handler() to accept 'enum
omap_channel' instead of 'struct omap_overlay_manager'.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 57a9a537f43fc9e82761c55ff2a09054db55ab99..10099f75364df55094c26ee963278aa547fffe74 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4156,7 +4156,7 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
        return 0;
 err1:
        if (dsi->mode == OMAP_DSS_DSI_CMD_MODE)
-               dss_mgr_unregister_framedone_handler(mgr,
+               dss_mgr_unregister_framedone_handler(mgr->id,
                                dsi_framedone_irq_callback, dsidev);
 err:
        dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);
@@ -4169,7 +4169,7 @@ static void dsi_display_uninit_dispc(struct platform_device *dsidev,
        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
 
        if (dsi->mode == OMAP_DSS_DSI_CMD_MODE)
-               dss_mgr_unregister_framedone_handler(mgr,
+               dss_mgr_unregister_framedone_handler(mgr->id,
                                dsi_framedone_irq_callback, dsidev);
 
        dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index ae9cae3a269ac30e125905fc3f2633441cea3336..186d978e01208074dbb0ce0dcf122fbe2ea59067 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -95,7 +95,7 @@ void dss_mgr_disable(enum omap_channel channel);
 void dss_mgr_start_update(enum omap_channel channel);
 int dss_mgr_register_framedone_handler(enum omap_channel channel,
                void (*handler)(void *), void *data);
-void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,
+void dss_mgr_unregister_framedone_handler(enum omap_channel channel,
                void (*handler)(void *), void *data);
 
 #endif /* __OMAP_DRM_DSS_H */

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 637f8926ec3aa8a26c1a8320923c9b1d8cb61c2b..829232ad8c8189d4449cdaf92cae047fb3562ff8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -241,9 +241,9 @@ int dss_mgr_register_framedone_handler(enum omap_channel channel,
 }
 EXPORT_SYMBOL(dss_mgr_register_framedone_handler);
 
-void dss_mgr_unregister_framedone_handler(struct omap_overlay_manager *mgr,
+void dss_mgr_unregister_framedone_handler(enum omap_channel channel,
                void (*handler)(void *), void *data)
 {
-       dss_mgr_ops->unregister_framedone_handler(mgr->id, handler, data);
+       dss_mgr_ops->unregister_framedone_handler(channel, handler, data);
 }
 EXPORT_SYMBOL(dss_mgr_unregister_framedone_handler);