From: Prashant Gaikwad Date: Fri, 11 Jan 2013 08:01:24 +0000 (+0530) Subject: staging: nvec: remove use of clk_get_sys X-Git-Tag: v3.9-rc1~118^2~15^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e54f0a21e7debcd8acb0fe39adc6f81751e1b57;p=profile%2Fivi%2Fkernel-x86-ivi.git staging: nvec: remove use of clk_get_sys 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 Acked-by: Greg Kroah-Hartman Acked-by: Marc Dietrich Acked-by: Julian Andres Klode [swarren: updated TODO file to remove entry that requested this change] Signed-off-by: Stephen Warren --- 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;