Message ID | 1367330994-7259-2-git-send-email-fabio.baltieri@linaro.org |
---|---|
State | Accepted |
Commit | 37c1b9273fefe90e45c7d01ba4209e42d5e3e058 |
Headers | show
Return-Path: <patchwork-forward+bncBDN7FN4YLAINHIP7RMCRUBFRT7BLA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B01A220065 for <linaro@patches.linaro.org>; Tue, 30 Apr 2013 14:10:30 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id b12sf889893yha.10 for <linaro@patches.linaro.org>; Tue, 30 Apr 2013 07:10:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=E+ceaTvhH2fAy9pULKo4lYc9EC+MH3D8kgpUiY+sMm4=; b=QmljAhTsDWeUbL1ueXwscQU05KlgbgCXXfEpBM16iSagf7KU3jp/myWEbNH3gWMo+R 9XqVB1TWWdWCYv/zctQHriwnqxVf5HOp1LppXPa1lcUHG37DpOnp0TCV1vbe0XNjaQ7O g84Kybl/70FcyqkCzBq9+adl7nc3bjEjynsBtWvXPJpdVw3EpFs5zACVCo4yN7WMdnBo dBa9px8BWksM8ScVEQEUrPDnHiQoemibFJC5Na60bzDbKRY9YFHnw28817glj67Uvgar /GcaD0RQTg3LrH7PNN6dusfXMdxhj/WswfU1fJEek856yL3AXE0hF4ATyJjI2CPy0haZ YAKg== X-Received: by 10.236.137.206 with SMTP id y54mr31227741yhi.36.1367331027632; Tue, 30 Apr 2013 07:10:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.16 with SMTP id z16ls240234qem.26.gmail; Tue, 30 Apr 2013 07:10:27 -0700 (PDT) X-Received: by 10.52.165.83 with SMTP id yw19mr29613038vdb.74.1367331027253; Tue, 30 Apr 2013 07:10:27 -0700 (PDT) Received: from mail-vb0-x22e.google.com (mail-vb0-x22e.google.com [2607:f8b0:400c:c02::22e]) by mx.google.com with ESMTPS id ff9si12112103vcb.83.2013.04.30.07.10.27 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:27 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22e; Received: by mail-vb0-f46.google.com with SMTP id 10so417601vbe.19 for <patchwork-forward@linaro.org>; Tue, 30 Apr 2013 07:10:27 -0700 (PDT) X-Received: by 10.52.69.109 with SMTP id d13mr7527000vdu.75.1367331027118; Tue, 30 Apr 2013 07:10:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp108603veb; Tue, 30 Apr 2013 07:10:26 -0700 (PDT) X-Received: by 10.15.35.71 with SMTP id f47mr79710226eev.15.1367331026059; Tue, 30 Apr 2013 07:10:26 -0700 (PDT) Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by mx.google.com with ESMTPS id g47si914087eem.71.2013.04.30.07.10.25 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:26 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.45 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.83.45; Received: by mail-ee0-f45.google.com with SMTP id l10so273739eei.4 for <patches@linaro.org>; Tue, 30 Apr 2013 07:10:25 -0700 (PDT) X-Received: by 10.14.202.201 with SMTP id d49mr16920799eeo.1.1367331025569; Tue, 30 Apr 2013 07:10:25 -0700 (PDT) Received: from localhost ([2a01:2003:1:1f50:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPSA id e50sm22352743eev.13.2013.04.30.07.10.19 for <multiple recipients> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:10:24 -0700 (PDT) From: Fabio Baltieri <fabio.baltieri@linaro.org> To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Lee Jones <lee.jones@linaro.org>, Ola Lilja <ola.o.lilja@stericsson.com>, Fabio Baltieri <fabio.baltieri@linaro.org> Subject: [PATCH 1/3] ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare Date: Tue, 30 Apr 2013 16:09:52 +0200 Message-Id: <1367330994-7259-2-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1367330994-7259-1-git-send-email-fabio.baltieri@linaro.org> References: <1367330994-7259-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQklJGoXIMY9Wm7Vz4BhGl8B5V6OiWwNAvk93U29fcDF1mNc2khpfEAboKgnHZjvddvMxzTT X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post?hl=en-US>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?hl=en-US&topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/?hl=en-US> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe?hl=en-US>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 21779a6..a80c883 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1095,9 +1095,9 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w, #ifdef CONFIG_HAVE_CLK if (SND_SOC_DAPM_EVENT_ON(event)) { - return clk_enable(w->clk); + return clk_prepare_enable(w->clk); } else { - clk_disable(w->clk); + clk_disable_unprepare(w->clk); return 0; } #endif
Update dapm_clock_event to use clk_prepare_enable and clk_disable_unprepare. Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org> --- sound/soc/soc-dapm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)