From patchwork Wed Jul 15 17:42:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 35732 Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6FHi1WY020215 for ; Wed, 15 Jul 2009 17:44:02 GMT Received: from dlep34.itg.ti.com ([157.170.170.115]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6FHgMAD021152; Wed, 15 Jul 2009 12:42:27 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id n6FHgLx8024722; Wed, 15 Jul 2009 12:42:21 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 61E8580627; Wed, 15 Jul 2009 12:42:20 -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 5EBE980627 for ; Wed, 15 Jul 2009 12:42:19 -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 n6FHgJd1023526 for ; Wed, 15 Jul 2009 12:42:19 -0500 (CDT) Received: from mail51-tx2-R.bigfish.com (mail-tx2.bigfish.com [65.55.88.112]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6FHgD4a032466 for ; Wed, 15 Jul 2009 12:42:18 -0500 Received: from mail51-tx2 (localhost.localdomain [127.0.0.1]) by mail51-tx2-R.bigfish.com (Postfix) with ESMTP id D761317A81CA for ; Wed, 15 Jul 2009 17:42:13 +0000 (UTC) X-SpamScore: 0 X-BigFish: vps0(zzzz1202hzzz2dh65h) X-Spam-TCS-SCL: 4:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.222.196; Service: EHS Received: by mail51-tx2 (MessageSwitch) id 1247679732299398_6125; Wed, 15 Jul 2009 17:42:12 +0000 (UCT) Received: from mail-pz0-f196.google.com (mail-pz0-f196.google.com [209.85.222.196]) by mail51-tx2.bigfish.com (Postfix) with ESMTP id 16AA51118058 for ; Wed, 15 Jul 2009 17:42:11 +0000 (UTC) Received: by pzk34 with SMTP id 34so1615879pzk.4 for ; Wed, 15 Jul 2009 10:42:11 -0700 (PDT) Received: by 10.142.170.20 with SMTP id s20mr2035036wfe.137.1247679731538; Wed, 15 Jul 2009 10:42:11 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 30sm14442482wfg.10.2009.07.15.10.42.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Jul 2009 10:42:10 -0700 (PDT) From: Kevin Hilman To: davinci-linux-open-source@linux.davincidsp.com Date: Wed, 15 Jul 2009 10:42:09 -0700 Message-Id: <1247679729-30490-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 Cc: Mark Brown Subject: [PATCH] ASoC: davinci: don't use 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 clock name strings are no longer passed on platform_data. Instead, we rely entirely on struct device and clkdev to find the right clock. Signed-off-by: Kevin Hilman --- Applies on Mark Brown's for-2.6.32 branch. sound/soc/davinci/davinci-i2s.c | 2 +- sound/soc/davinci/davinci-mcasp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index f7330e1..e5cd97b 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 = clk_get(&pdev->dev, NULL); if (IS_ERR(dev->clk)) { ret = -ENODEV; goto err_free_mem; diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index b27aab6..f0c0347 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 = clk_get(&pdev->dev, NULL); if (IS_ERR(dev->clk)) { ret = -ENODEV; goto err_release_region;