Patchwork [V3] staging: nvec: remove use of clk_get_sys

login
register
mail settings
Submitter Stephen Warren
Date Jan. 11, 2013, 9:03 p.m.
Message ID <1357938234-16570-1-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/211420/
State Accepted, archived
Headers show

Comments

Stephen Warren - Jan. 11, 2013, 9:03 p.m.
From: Prashant Gaikwad <pgaikwad@nvidia.com>

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 <pgaikwad@nvidia.com>
[swarren: updated TODO file to remove entry that requested this change]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
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(-)
Greg KH - Jan. 12, 2013, 12:43 a.m.
On Fri, Jan 11, 2013 at 02:03:54PM -0700, Stephen Warren wrote:
> From: Prashant Gaikwad <pgaikwad@nvidia.com>
> 
> 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 <pgaikwad@nvidia.com>
> [swarren: updated TODO file to remove entry that requested this change]
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> Note: This patch needs to go through the Tegra tree due to dependencies
> on the clock driver rework there.

Fine with me:
	Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marc Dietrich - Jan. 12, 2013, 12:03 p.m.
On Friday 11 January 2013 16:43:50 Greg Kroah-Hartman wrote:
> On Fri, Jan 11, 2013 at 02:03:54PM -0700, Stephen Warren wrote:
> > From: Prashant Gaikwad <pgaikwad@nvidia.com>
> > 
> > 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 <pgaikwad@nvidia.com>
> > [swarren: updated TODO file to remove entry that requested this change]
> > Signed-off-by: Stephen Warren <swarren@nvidia.com>
> > ---
> > Note: This patch needs to go through the Tegra tree due to dependencies
> > on the clock driver rework there.
> 
> Fine with me:
> 	Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

and me too:

Acked-by: Marc Dietrich <marvin24@gmx.de>

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julian Andres Klode - Jan. 12, 2013, 7:41 p.m.
On Fri, Jan 11, 2013 at 02:03:54PM -0700, Stephen Warren wrote:
> From: Prashant Gaikwad <pgaikwad@nvidia.com>
> 
> 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 <pgaikwad@nvidia.com>
> [swarren: updated TODO file to remove entry that requested this change]
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> Note: This patch needs to go through the Tegra tree due to dependencies
> on the clock driver rework there.

Looks fine to me, and one thing less on TODO is always good.

Acked-by: Julian Andres Klode <jak@jak-linux.org>

Patch

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;