From patchwork Fri Jan 11 21:03:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 211420 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 56EEB2C035B for ; Sat, 12 Jan 2013 08:04:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755708Ab3AKVEB (ORCPT ); Fri, 11 Jan 2013 16:04:01 -0500 Received: from avon.wwwdotorg.org ([70.85.31.133]:33478 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755636Ab3AKVEA (ORCPT ); Fri, 11 Jan 2013 16:04:00 -0500 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 11925635E; Fri, 11 Jan 2013 14:05:22 -0700 (MST) Received: from swarren-lx1.nvidia.com (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id BA2BFE40EB; Fri, 11 Jan 2013 14:03:58 -0700 (MST) From: Stephen Warren To: Greg Kroah-Hartman Cc: Marc Dietrich , Julian Andres Klode , ac100@lists.launchpad.net, devel@driverdev.osuosl.org, linux-tegra@vger.kernel.org, Prashant Gaikwad , Stephen Warren Subject: [PATCH V3] staging: nvec: remove use of clk_get_sys Date: Fri, 11 Jan 2013 14:03:54 -0700 Message-Id: <1357938234-16570-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.7.10.4 X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Prashant Gaikwad As clock information is added to device tree clock can be looked up using clk_get. Remove use of clk_get_sys. Signed-off-by: Prashant Gaikwad [swarren: updated TODO file to remove entry that requested this change] Signed-off-by: Stephen Warren Acked-by: Marc Dietrich Acked-by: Julian Andres Klode --- Note: This patch needs to go through the Tegra tree due to dependencies on the clock driver rework there. v3: Added update to TODO file drivers/staging/nvec/TODO | 4 ---- drivers/staging/nvec/nvec.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/nvec/TODO b/drivers/staging/nvec/TODO index f950ab8..e5ae42a 100644 --- a/drivers/staging/nvec/TODO +++ b/drivers/staging/nvec/TODO @@ -1,9 +1,5 @@ ToDo list (incomplete, unordered) - add compile as module support - - fix clk usage - should not be using clk_get_sys(), but clk_get(&pdev->dev, conn) - where conn is either NULL if the device only has one clock, or - the device specific name if it has multiple clocks. - move half of the nvec init stuff to i2c-tegra.c - move event handling to nvec_events - finish suspend/resume support diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index d51615b..9417941 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -770,7 +770,7 @@ static int tegra_nvec_probe(struct platform_device *pdev) return -ENODEV; } - i2c_clk = clk_get_sys("tegra-i2c.2", "div-clk"); + i2c_clk = clk_get(&pdev->dev, "div-clk"); if (IS_ERR(i2c_clk)) { dev_err(nvec->dev, "failed to get controller clock\n"); return -ENODEV;