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: 29518 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by bilbo.ozlabs.org (Postfix) with ESMTP id B7884B707C for ; Tue, 7 Jul 2009 08:26:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752558AbZGFW0R (ORCPT ); Mon, 6 Jul 2009 18:26:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753188AbZGFW0R (ORCPT ); Mon, 6 Jul 2009 18:26:17 -0400 Received: from wf-out-1314.google.com ([209.85.200.169]:5238 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752558AbZGFW0Q (ORCPT ); Mon, 6 Jul 2009 18:26:16 -0400 Received: by wf-out-1314.google.com with SMTP id 26so1615549wfd.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 Cc: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH] IDE: palm_bk3710: convert clock usage after clkdev conversion 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 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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;