From patchwork Sun May 12 18:12:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 2555821 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 94E503FC5A for ; Sun, 12 May 2013 18:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750824Ab3ELSQs (ORCPT ); Sun, 12 May 2013 14:16:48 -0400 Received: from smtp-out-237.synserver.de ([212.40.185.237]:1042 "EHLO smtp-out-236.synserver.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750808Ab3ELSQs (ORCPT ); Sun, 12 May 2013 14:16:48 -0400 X-Greylist: delayed 400 seconds by postgrey-1.27 at vger.kernel.org; Sun, 12 May 2013 14:16:47 EDT Received: (qmail 23789 invoked by uid 0); 12 May 2013 18:10:07 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@laprican.de X-SynServer-PPID: 23317 Received: from ppp-188-174-146-61.dynamic.mnet-online.de (HELO lars-laptop.fritz.box) [188.174.146.61] by 217.119.54.87 with SMTP; 12 May 2013 18:10:06 -0000 From: Lars-Peter Clausen To: Chris Ball Cc: linux-mmc@vger.kernel.org, Lars-Peter Clausen Subject: [PATCH] mmc: jz4740: Use clk_prepare_enable/clk_disable_unprepare Date: Sun, 12 May 2013 20:12:38 +0200 Message-Id: <1368382358-4433-1-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.2.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org In preparation to switching the jz4740 clk driver to the common clk framework update the clk enable/disable calls to clk_prepare_enable/clk_disable_unprepare. Signed-off-by: Lars-Peter Clausen --- drivers/mmc/host/jz4740_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 2391c6b..2bc147f 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -626,7 +626,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) gpio_set_value(host->pdata->gpio_power, !host->pdata->power_active_low); host->cmdat |= JZ_MMC_CMDAT_INIT; - clk_enable(host->clk); + clk_prepare_enable(host->clk); break; case MMC_POWER_ON: break; @@ -634,7 +634,7 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (gpio_is_valid(host->pdata->gpio_power)) gpio_set_value(host->pdata->gpio_power, host->pdata->power_active_low); - clk_disable(host->clk); + clk_disable_unprepare(host->clk); break; }