From patchwork Mon Jun 30 19:14:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 4454061 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E4F669F390 for ; Mon, 30 Jun 2014 19:16:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D6062038E for ; Mon, 30 Jun 2014 19:16:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DDFD2037E for ; Mon, 30 Jun 2014 19:16:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754670AbaF3TQx (ORCPT ); Mon, 30 Jun 2014 15:16:53 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:44046 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754601AbaF3TQw (ORCPT ); Mon, 30 Jun 2014 15:16:52 -0400 Received: by mail-wi0-f180.google.com with SMTP id hi2so6581181wib.13 for ; Mon, 30 Jun 2014 12:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3zTaT386vT7VyKXbm6Hueqk7/FdYr3jAvAU80z/E1/U=; b=UZghQljL2ArdMUk4XEZoV0XVbNV8vcsITYz82zqcRxSMKUqqR0vWv1DV0/8AUid8TY 4m/zPLuyun9jgrcdVEATVxQqQKIIzKWLV61a6WgwZbWkezjflSBWazkXWiI1QfT4Q8+t DFt8B6CP1LV/4VDy8xdOrbYJDbtT8/Q1SqVtIZKMuCxVg0o7BeZrm2cOO4wsIaCUlkX2 GYKZ6Tmkg8i9MAGlRN7QjF33cuQuEWQwgLn6KCDRkVtJDHMMKF6im3KZ1XaHPsC8UHMW rnRAYILJQ7C0EhI19FyD/o6K/7JuvL5znJBdKYhlbicnYXyyTBtsrNgUxMpywh7d573V oZ5Q== X-Received: by 10.180.12.33 with SMTP id v1mr32057875wib.0.1404155811372; Mon, 30 Jun 2014 12:16:51 -0700 (PDT) Received: from anarsoul-thinkpad.localdomain ([212.98.170.222]) by mx.google.com with ESMTPSA id ub8sm34524035wib.0.2014.06.30.12.16.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jun 2014 12:16:50 -0700 (PDT) From: Vasily Khoruzhick To: Ben Dooks , Kukjin Kim , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Vasily Khoruzhick Subject: [PATCH] video: fbdev: s3c2410fb: Move to clk_prepare_enable/clk_disable_unprepare Date: Mon, 30 Jun 2014 22:14:32 +0300 Message-Id: <1404155672-3158-1-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 2.0.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework. Signed-off-by: Vasily Khoruzhick --- drivers/video/fbdev/s3c2410fb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/s3c2410fb.c b/drivers/video/fbdev/s3c2410fb.c index 81af5a6..d68595d 100644 --- a/drivers/video/fbdev/s3c2410fb.c +++ b/drivers/video/fbdev/s3c2410fb.c @@ -932,7 +932,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev, goto release_irq; } - clk_enable(info->clk); + clk_prepare_enable(info->clk); dprintk("got and enabled clock\n"); usleep_range(1000, 1100); @@ -996,7 +996,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev, free_video_memory: s3c2410fb_unmap_video_memory(fbinfo); release_clock: - clk_disable(info->clk); + clk_disable_unprepare(info->clk); clk_put(info->clk); release_irq: free_irq(irq, info); @@ -1038,7 +1038,7 @@ static int s3c2410fb_remove(struct platform_device *pdev) s3c2410fb_unmap_video_memory(fbinfo); if (info->clk) { - clk_disable(info->clk); + clk_disable_unprepare(info->clk); clk_put(info->clk); info->clk = NULL; } @@ -1070,7 +1070,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state) * before the clock goes off again (bjd) */ usleep_range(1000, 1100); - clk_disable(info->clk); + clk_disable_unprepare(info->clk); return 0; } @@ -1080,7 +1080,7 @@ static int s3c2410fb_resume(struct platform_device *dev) struct fb_info *fbinfo = platform_get_drvdata(dev); struct s3c2410fb_info *info = fbinfo->par; - clk_enable(info->clk); + clk_prepare_enable(info->clk); usleep_range(1000, 1100); s3c2410fb_init_registers(fbinfo);