diff options
| author | Tomi Valkeinen | 2015-11-05 08:23:47 +0100 |
|---|---|---|
| committer | Tomi Valkeinen | 2016-03-03 16:38:23 +0100 |
| commit | 3421899893d9c430635b909e1ba0287ba6319e34 (patch) | |
| tree | 966d3311cf0e87f2fd80a04a66c7084a4edf8c17 /drivers/gpu | |
| parent | drm/omap: convert dss_mgr_register_framedone_handler to accept omap_channel (diff) | |
| download | kernel-qcow2-linux-3421899893d9c430635b909e1ba0287ba6319e34.tar.gz kernel-qcow2-linux-3421899893d9c430635b909e1ba0287ba6319e34.tar.xz kernel-qcow2-linux-3421899893d9c430635b909e1ba0287ba6319e34.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dsi.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/output.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 57a9a537f43f..10099f75364d 100644 --- 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 ae9cae3a269a..186d978e0120 100644 --- 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 637f8926ec3a..829232ad8c81 100644 --- 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); |