From: Laurent Pinchart Date: Mon, 28 Oct 2013 22:49:22 +0000 (+0100) Subject: drm: shmob_drm: Convert to clk_prepare/unprepare X-Git-Tag: Ubuntu-5.10.0-12.13~17978^2~6 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8d01e1ef6766babffb5965218beb207dde693fb5;p=mirror_ubuntu-hirsute-kernel.git drm: shmob_drm: Convert to clk_prepare/unprepare Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and clk_disable_unprepare() to get ready for the migration to the common clock framework. Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Laurent Pinchart Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index 54bad98e9477..562f9a401cf6 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c @@ -40,7 +40,7 @@ static void shmob_drm_clk_on(struct shmob_drm_device *sdev) { if (sdev->clock) - clk_enable(sdev->clock); + clk_prepare_enable(sdev->clock); #if 0 if (sdev->meram_dev && sdev->meram_dev->pdev) pm_runtime_get_sync(&sdev->meram_dev->pdev->dev); @@ -54,7 +54,7 @@ static void shmob_drm_clk_off(struct shmob_drm_device *sdev) pm_runtime_put_sync(&sdev->meram_dev->pdev->dev); #endif if (sdev->clock) - clk_disable(sdev->clock); + clk_disable_unprepare(sdev->clock); } /* -----------------------------------------------------------------------------