From patchwork Mon Jul 6 22:48:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 34351 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 n66MoeM5028262 for ; Mon, 6 Jul 2009 22:50:40 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n66MmpRN016791; Mon, 6 Jul 2009 17:48:56 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id n66MmoED016777; Mon, 6 Jul 2009 17:48:51 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 4226E80627; Mon, 6 Jul 2009 17:48:50 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 5C90C80626 for ; Mon, 6 Jul 2009 17:48:49 -0500 (CDT) Received: from red.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id n66Mmmn4007469 for ; Mon, 6 Jul 2009 17:48:48 -0500 (CDT) Received: from mail10-tx2-R.bigfish.com (mail-tx2.bigfish.com [65.55.88.111]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id n66MmhRc003319 for ; Mon, 6 Jul 2009 17:48:48 -0500 Received: from mail10-tx2 (localhost.localdomain [127.0.0.1]) by mail10-tx2-R.bigfish.com (Postfix) with ESMTP id 806FABA01EF for ; Mon, 6 Jul 2009 22:48:43 +0000 (UTC) X-SpamScore: 0 X-BigFish: vps0(zzzz1202hzzz2dh61h) X-Spam-TCS-SCL: 0:0 X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.200.169; Service: EHS Received: by mail10-tx2 (MessageSwitch) id 124692052297168_26535; Mon, 6 Jul 2009 22:48:42 +0000 (UCT) Received: from wf-out-1314.google.com (wf-out-1314.google.com [209.85.200.169]) by mail10-tx2.bigfish.com (Postfix) with ESMTP id CFB071728055 for ; Mon, 6 Jul 2009 22:48:41 +0000 (UTC) Received: by wf-out-1314.google.com with SMTP id 29so1569713wff.31 for ; Mon, 06 Jul 2009 15:48:41 -0700 (PDT) Received: by 10.143.34.20 with SMTP id m20mr1580915wfj.103.1246920521108; Mon, 06 Jul 2009 15:48:41 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 30sm23195419wfd.3.2009.07.06.15.48.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 06 Jul 2009 15:48:40 -0700 (PDT) From: Kevin Hilman To: ben-linux@fluff.org, linux-i2c@vger.kernel.org Date: Mon, 6 Jul 2009 15:48:35 -0700 Message-Id: <1246920516-31462-2-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1246920516-31462-1-git-send-email-khilman@deeprootsystems.com> References: <1246920516-31462-1-git-send-email-khilman@deeprootsystems.com> Cc: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 1/2] i2c-davinci: convert clock usage after clkdev conversion 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 DaVinci core code has converted to the new clkdev API so clock name strings are not needed. Instead, just the a 'struct device' pointer is needed. Signed-off-by: Kevin Hilman --- drivers/i2c/busses/i2c-davinci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 3fae3a9..ee3fbb8 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -523,7 +523,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) dev->irq = irq->start; platform_set_drvdata(pdev, dev); - dev->clk = clk_get(&pdev->dev, "I2CCLK"); + dev->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(dev->clk)) { r = -ENODEV; goto err_free_mem;