From patchwork Mon Jun 30 19:09:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 4453891 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7F6B5BEEAA for ; Mon, 30 Jun 2014 19:13:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A88F520382 for ; Mon, 30 Jun 2014 19:13:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFC7B2037E for ; Mon, 30 Jun 2014 19:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932201AbaF3TLy (ORCPT ); Mon, 30 Jun 2014 15:11:54 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:51243 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932125AbaF3TLw (ORCPT ); Mon, 30 Jun 2014 15:11:52 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so6636570wib.11 for ; Mon, 30 Jun 2014 12:11: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=EVDYKXRnfgW+kD2Wx6BapdoEJI5urYXggNOqOh/1olk=; b=O/2IVdIUWbBkZtDDrMRG3bT5M0Y9KqYhkIqsCudKizrls5klubHU4RJ2GNsy41H+PA prR67h9WLgd/WAZ6q0uz6qit0hFyrQc+w7icWAImpbWu/dmh2fSUKsztDfI/9uiL7Q36 7hU9DNYf83tn95FdOQOpNBV9NEA4Q9drPhyc1tIc7QBsMIQIYzG5kHYLSWbsD12ylJWX 7XvC4Uf9a3MVfE8uocD0i86yEESN2Grx32CNoqh8zhaM8I14GIlOkDQViYSbQ367Limf R7Fk6ptj8vaUCKzGiyQDa9nwXkvuP/5jiawHMwJaRmyjqzS58cMwoDbSO09SnadRqIQD yX2g== X-Received: by 10.194.48.103 with SMTP id k7mr46130897wjn.68.1404155511170; Mon, 30 Jun 2014 12:11:51 -0700 (PDT) Received: from anarsoul-thinkpad.localdomain ([212.98.170.222]) by mx.google.com with ESMTPSA id ud5sm14517329wjc.31.2014.06.30.12.11.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jun 2014 12:11:50 -0700 (PDT) From: Vasily Khoruzhick To: Ben Dooks , Kukjin Kim , Dmitry Torokhov , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-input@vger.kernel.org Cc: Vasily Khoruzhick Subject: [PATCH] Input: s3c2410_ts: Move to clk_prepare_enable/clk_disable_unprepare Date: Mon, 30 Jun 2014 22:09:37 +0300 Message-Id: <1404155377-2862-1-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 2.0.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@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 Reviewed-by: Tomasz Figa --- drivers/input/touchscreen/s3c2410_ts.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 19cb247..c0e0baa 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -264,7 +264,7 @@ static int s3c2410ts_probe(struct platform_device *pdev) return -ENOENT; } - clk_enable(ts.clock); + clk_prepare_enable(ts.clock); dev_dbg(dev, "got and enabled clocks\n"); ts.irq_tc = ret = platform_get_irq(pdev, 0); @@ -369,7 +369,7 @@ static int s3c2410ts_remove(struct platform_device *pdev) free_irq(ts.irq_tc, ts.input); del_timer_sync(&touch_timer); - clk_disable(ts.clock); + clk_disable_unprepare(ts.clock); clk_put(ts.clock); input_unregister_device(ts.input); @@ -383,7 +383,7 @@ static int s3c2410ts_suspend(struct device *dev) { writel(TSC_SLEEP, ts.io + S3C2410_ADCTSC); disable_irq(ts.irq_tc); - clk_disable(ts.clock); + clk_disable_unprepare(ts.clock); return 0; } @@ -393,7 +393,7 @@ static int s3c2410ts_resume(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct s3c2410_ts_mach_info *info = dev_get_platdata(&pdev->dev); - clk_enable(ts.clock); + clk_prepare_enable(ts.clock); enable_irq(ts.irq_tc); /* Initialise registers */