From patchwork Mon Jul 6 22:26:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 34348 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n66MS0ke026099 for ; Mon, 6 Jul 2009 22:28:00 GMT Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id n66MQSUb017518; Mon, 6 Jul 2009 17:26:33 -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 n66MQRNZ002371; Mon, 6 Jul 2009 17:26:27 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 4EF4080627; Mon, 6 Jul 2009 17:26:27 -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 5783880626 for ; Mon, 6 Jul 2009 17:26:26 -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 n66MQQYh002900 for ; Mon, 6 Jul 2009 17:26:26 -0500 (CDT) Received: from mail1-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 n66MQKW8022575 for ; Mon, 6 Jul 2009 17:26:25 -0500 Received: from mail1-tx2 (localhost.localdomain [127.0.0.1]) by mail1-tx2-R.bigfish.com (Postfix) with ESMTP id C7044D18434 for ; Mon, 6 Jul 2009 22:26:20 +0000 (UTC) X-SpamScore: -5 X-BigFish: vps-5(zz936eMzz1202hzzz2dh62h) X-Spam-TCS-SCL: 1:0 X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.222.185; Service: EHS Received: by mail1-tx2 (MessageSwitch) id 1246919179249641_19677; Mon, 6 Jul 2009 22:26:19 +0000 (UCT) Received: from mail-pz0-f185.google.com (mail-pz0-f185.google.com [209.85.222.185]) by mail1-tx2.bigfish.com (Postfix) with ESMTP id 0A8F1AC0061 for ; Mon, 6 Jul 2009 22:26:18 +0000 (UTC) Received: by pzk15 with SMTP id 15so498299pzk.4 for ; Mon, 06 Jul 2009 15:26:18 -0700 (PDT) Received: by 10.143.14.6 with SMTP id r6mr1593456wfi.24.1246919178507; Mon, 06 Jul 2009 15:26:18 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 20sm24166233wfi.20.2009.07.06.15.26.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 06 Jul 2009 15:26:17 -0700 (PDT) From: Kevin Hilman To: linux-ide@vger.kernel.org, Sergei Shtylyov Date: Mon, 6 Jul 2009 15:26:16 -0700 Message-Id: <1246919176-28683-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 Cc: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH] IDE: palm_bk3710: 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 Acked-by: Sergei Shtylyov --- Fix needed for 2.6.31 drivers/ide/palm_bk3710.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c index 3c1dc01..f8eddf0 100644 --- a/drivers/ide/palm_bk3710.c +++ b/drivers/ide/palm_bk3710.c @@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev) int i, rc; struct ide_hw hw, *hws[] = { &hw }; - clk = clk_get(&pdev->dev, "IDECLK"); + clk = clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) return -ENODEV;