From patchwork Fri Dec 5 14:42:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 5444241 Return-Path: X-Original-To: patchwork-alsa-devel@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 DAEE5BEEA8 for ; Fri, 5 Dec 2014 14:43:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 11DAB20265 for ; Fri, 5 Dec 2014 14:43:38 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1070A20155 for ; Fri, 5 Dec 2014 14:43:36 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3C5F5264FE3; Fri, 5 Dec 2014 15:43:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 802F32605D9; Fri, 5 Dec 2014 15:43:19 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id EFEDB2605E2; Fri, 5 Dec 2014 15:43:13 +0100 (CET) Received: from mout.web.de (mout.web.de [212.227.17.12]) by alsa0.perex.cz (Postfix) with ESMTP id 61D6E2605C2 for ; Fri, 5 Dec 2014 15:43:06 +0100 (CET) Received: from kongar.lan.local ([77.64.221.251]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0M41Bm-1XfeQT3R1m-00rWpG; Fri, 05 Dec 2014 15:42:59 +0100 From: Alexander Stein To: Jaroslav Kysela , Takashi Iwai Date: Fri, 5 Dec 2014 15:42:53 +0100 Message-Id: <1417790574-13919-1-git-send-email-alexanders83@web.de> X-Mailer: git-send-email 2.2.0 X-Provags-ID: V03:K0:Qdh6aYyb3g274j8op/4VCK3iZBLE5kiDpyq1ada/8yjDnt5ATfY YquSuJcdXl9osbEiuVN231BdyAyU9V/XNAUbRxuGilF5SFunXoA2UmWaaHxoIskKcF5LvP1 TbJmaWXUn10L437HEijnGObiVDTYWviEDK3P5YvB4yt6Ygj2VTjpZWFh2JVm6FnL4GxJM4l cWepPoJYPW0lSqS+zmlZg== X-UI-Out-Filterresults: notjunk:1; Cc: Alexander Stein , Alexandre Belloni , alsa-devel@alsa-project.org, Nicolas Ferre , Arnd Bergmann Subject: [alsa-devel] [PATCH 1/2] ALSA: sound/atmel/ac97c.c: Add missing clock prepare X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Replace clk_enable with clk_prepare_enable and clk_disable with clk_disable_unprepare. Signed-off-by: Alexander Stein --- sound/atmel/ac97c.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index b2a3225..ff2f743 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -989,7 +989,7 @@ static int atmel_ac97c_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "no peripheral clock\n"); return PTR_ERR(pclk); } - clk_enable(pclk); + clk_prepare_enable(pclk); retval = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, THIS_MODULE, @@ -1167,7 +1167,7 @@ err_ioremap: err_request_irq: snd_card_free(card); err_snd_card_new: - clk_disable(pclk); + clk_disable_unprepare(pclk); clk_put(pclk); return retval; } @@ -1184,7 +1184,7 @@ static int atmel_ac97c_suspend(struct device *pdev) if (test_bit(DMA_TX_READY, &chip->flags)) dw_dma_cyclic_stop(chip->dma.tx_chan); } - clk_disable(chip->pclk); + clk_disable_unprepare(chip->pclk); return 0; } @@ -1194,7 +1194,7 @@ static int atmel_ac97c_resume(struct device *pdev) struct snd_card *card = dev_get_drvdata(pdev); struct atmel_ac97c *chip = card->private_data; - clk_enable(chip->pclk); + clk_prepare_enable(chip->pclk); if (cpu_is_at32ap7000()) { if (test_bit(DMA_RX_READY, &chip->flags)) dw_dma_cyclic_start(chip->dma.rx_chan); @@ -1222,7 +1222,7 @@ static int atmel_ac97c_remove(struct platform_device *pdev) ac97c_writel(chip, COMR, 0); ac97c_writel(chip, MR, 0); - clk_disable(chip->pclk); + clk_disable_unprepare(chip->pclk); clk_put(chip->pclk); iounmap(chip->regs); free_irq(chip->irq, chip);