From patchwork Mon Jun 30 19:11:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 4453921 Return-Path: X-Original-To: patchwork-linux-mmc@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 A8CCE9F358 for ; Mon, 30 Jun 2014 19:13:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D55312037E for ; Mon, 30 Jun 2014 19:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5FDF2037D for ; Mon, 30 Jun 2014 19:13:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756944AbaF3TNW (ORCPT ); Mon, 30 Jun 2014 15:13:22 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:39603 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756644AbaF3TNU (ORCPT ); Mon, 30 Jun 2014 15:13:20 -0400 Received: by mail-wi0-f181.google.com with SMTP id n3so6554513wiv.8 for ; Mon, 30 Jun 2014 12:13:19 -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=qaeupTzvfh4b0tQAUoRaBP7XkYov7dSwzFeag5xXVgk=; b=LKbGNU1/Q0LmaSAbYVnWIB6oiw1ao/6rQ1ko1BM+jY4udBr8yfB08pCvi69TJp2Aoh NCGAOTEnCnlmsB+r1awlx/Kp6Vy6XAIH9MLUhBOyhK2GSjjK63BvUO48PyzPqLXI7K7C gf2cu3WhwLXTvLrvBq/Un5ODln+3QG9DRU08p62Sf19D0DwnpqZnag0vN5YaC0WbENWG ezUxZPdYFKpn9giwxB33LwJLfR/1yMf8brYf1mdCuCoNxI63i3ObFoqRRirH87VZ5Ag2 TMShvocT5kx5ux3O9fGzQMWuodA4pdAG1qebyIVI06UzUU/l4kjP9Qlq+iB+VqfEP4pW NI+w== X-Received: by 10.180.90.132 with SMTP id bw4mr22917989wib.42.1404155599333; Mon, 30 Jun 2014 12:13:19 -0700 (PDT) Received: from anarsoul-thinkpad.localdomain ([212.98.170.222]) by mx.google.com with ESMTPSA id jb16sm34458668wic.10.2014.06.30.12.13.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jun 2014 12:13:18 -0700 (PDT) From: Vasily Khoruzhick To: Ben Dooks , Chris Ball , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Cc: Vasily Khoruzhick Subject: [PATCH] s3cmci: Move to clk_prepare_enable/clk_disable_unprepare Date: Mon, 30 Jun 2014 22:11:06 +0300 Message-Id: <1404155466-2971-1-git-send-email-anarsoul@gmail.com> X-Mailer: git-send-email 2.0.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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/mmc/host/s3cmci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 0d115a8..e5516a2 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1707,7 +1707,7 @@ static int s3cmci_probe(struct platform_device *pdev) goto probe_free_dma; } - ret = clk_enable(host->clk); + ret = clk_prepare_enable(host->clk); if (ret) { dev_err(&pdev->dev, "failed to enable clock source.\n"); goto clk_free; @@ -1765,7 +1765,7 @@ static int s3cmci_probe(struct platform_device *pdev) s3cmci_cpufreq_deregister(host); free_dmabuf: - clk_disable(host->clk); + clk_disable_unprepare(host->clk); clk_free: clk_put(host->clk); @@ -1817,7 +1817,7 @@ static void s3cmci_shutdown(struct platform_device *pdev) s3cmci_debugfs_remove(host); s3cmci_cpufreq_deregister(host); mmc_remove_host(mmc); - clk_disable(host->clk); + clk_disable_unprepare(host->clk); } static int s3cmci_remove(struct platform_device *pdev)