From patchwork Mon Jul 13 22:02:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 35490 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6DM4pZ2009449 for ; Mon, 13 Jul 2009 22:04:52 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6DM2usu022413; Mon, 13 Jul 2009 17:03:01 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id n6DM2smK007591; Mon, 13 Jul 2009 17:02:54 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id B3C2E80627; Mon, 13 Jul 2009 17:02:54 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 98B4380626 for ; Mon, 13 Jul 2009 17:02:52 -0500 (CDT) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id n6DM2qUd006706 for ; Mon, 13 Jul 2009 17:02:52 -0500 (CDT) Received: from mail143-tx2-R.bigfish.com (mail-tx2.bigfish.com [65.55.88.113]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6DM2lWX003876 for ; Mon, 13 Jul 2009 17:02:52 -0500 Received: from mail143-tx2 (localhost.localdomain [127.0.0.1]) by mail143-tx2-R.bigfish.com (Postfix) with ESMTP id 29A5714B80D5 for ; Mon, 13 Jul 2009 22:02:47 +0000 (UTC) X-SpamScore: 0 X-BigFish: vps0(zzzz1202hzzz2dh6bh61h) X-Spam-TCS-SCL: 0:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.222.196; Service: EHS Received: by mail143-tx2 (MessageSwitch) id 1247522565471808_19850; Mon, 13 Jul 2009 22:02:45 +0000 (UCT) Received: from mail-pz0-f196.google.com (mail-pz0-f196.google.com [209.85.222.196]) by mail143-tx2.bigfish.com (Postfix) with ESMTP id 40E29650016 for ; Mon, 13 Jul 2009 22:02:45 +0000 (UTC) Received: by pzk34 with SMTP id 34so636027pzk.4 for ; Mon, 13 Jul 2009 15:02:44 -0700 (PDT) Received: by 10.142.147.15 with SMTP id u15mr1403431wfd.18.1247522564738; Mon, 13 Jul 2009 15:02:44 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 28sm9859220wfg.25.2009.07.13.15.02.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 13 Jul 2009 15:02:44 -0700 (PDT) To: Mark Brown References: <1247521841-21358-1-git-send-email-khilman@deeprootsystems.com> <1247521841-21358-2-git-send-email-khilman@deeprootsystems.com> <1247521841-21358-3-git-send-email-khilman@deeprootsystems.com> <1247521841-21358-4-git-send-email-khilman@deeprootsystems.com> From: Kevin Hilman Organization: Deep Root Systems, LLC Date: Mon, 13 Jul 2009 15:02:42 -0700 In-Reply-To: <1247521841-21358-4-git-send-email-khilman@deeprootsystems.com> (Kevin Hilman's message of "Mon\, 13 Jul 2009 14\:50\:41 -0700") Message-ID: <87skh0dywt.fsf@deeprootsystems.com> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Cc: davinci-linux-open-source@linux.davincidsp.com Subject: Re: [PATCH 3/3] ASoC: davinci: clock pointers instead of clock names X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com oops, sent the wrong version of this patch. Here's the right one, with clk_put() removed also. Kevin >From 40714ce314529bfc695087bc1b8b7d13794e088d Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 13 Jul 2009 14:28:37 -0700 Subject: [PATCH 3/3] ASoC: davinci: clock pointers instead of clock names Signed-off-by: Kevin Hilman --- sound/soc/davinci/davinci-i2s.c | 3 +-- sound/soc/davinci/davinci-mcasp.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index f7330e1..89b90e2 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c @@ -528,7 +528,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) goto err_release_region; } - dev->clk = clk_get(&pdev->dev, pdata->clk_name); + dev->clk = pdata->clk; if (IS_ERR(dev->clk)) { ret = -ENODEV; goto err_free_mem; @@ -584,7 +584,6 @@ static int davinci_i2s_remove(struct platform_device *pdev) snd_soc_unregister_dai(&davinci_i2s_dai); clk_disable(dev->clk); - clk_put(dev->clk); dev->clk = NULL; kfree(dev); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index b27aab6..68e1d82 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -764,7 +764,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) } pdata = pdev->dev.platform_data; - dev->clk = clk_get(&pdev->dev, pdata->clk_name); + dev->clk = pdata->clk; if (IS_ERR(dev->clk)) { ret = -ENODEV; goto err_release_region; @@ -834,7 +834,6 @@ static int davinci_mcasp_remove(struct platform_device *pdev) snd_soc_unregister_dai(&davinci_mcasp_dai[pdev->id]); dev = davinci_mcasp_dai[pdev->id].private_data; clk_disable(dev->clk); - clk_put(dev->clk); dev->clk = NULL; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);