diff options
author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2013-01-11 03:01:24 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 13:19:33 -0500 |
commit | 1e54f0a21e7debcd8acb0fe39adc6f81751e1b57 (patch) | |
tree | b43bf029ac989b5377066fd926ba3d3634c5b866 | |
parent | d409b3af89e93f1e08acf157126fc77188e2b89c (diff) |
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 <pgaikwad@nvidia.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Marc Dietrich <marvin24@gmx.de>
Acked-by: Julian Andres Klode <jak@jak-linux.org>
[swarren: updated TODO file to remove entry that requested this change]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r-- | drivers/staging/nvec/TODO | 4 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/nvec/TODO b/drivers/staging/nvec/TODO index f950ab890e2e..e5ae42a0b44a 100644 --- a/drivers/staging/nvec/TODO +++ b/drivers/staging/nvec/TODO | |||
@@ -1,9 +1,5 @@ | |||
1 | ToDo list (incomplete, unordered) | 1 | ToDo list (incomplete, unordered) |
2 | - add compile as module support | 2 | - add compile as module support |
3 | - fix clk usage | ||
4 | should not be using clk_get_sys(), but clk_get(&pdev->dev, conn) | ||
5 | where conn is either NULL if the device only has one clock, or | ||
6 | the device specific name if it has multiple clocks. | ||
7 | - move half of the nvec init stuff to i2c-tegra.c | 3 | - move half of the nvec init stuff to i2c-tegra.c |
8 | - move event handling to nvec_events | 4 | - move event handling to nvec_events |
9 | - finish suspend/resume support | 5 | - finish suspend/resume support |
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index d51615b19797..9417941974f7 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) | |||
770 | return -ENODEV; | 770 | return -ENODEV; |
771 | } | 771 | } |
772 | 772 | ||
773 | i2c_clk = clk_get_sys("tegra-i2c.2", "div-clk"); | 773 | i2c_clk = clk_get(&pdev->dev, "div-clk"); |
774 | if (IS_ERR(i2c_clk)) { | 774 | if (IS_ERR(i2c_clk)) { |
775 | dev_err(nvec->dev, "failed to get controller clock\n"); | 775 | dev_err(nvec->dev, "failed to get controller clock\n"); |
776 | return -ENODEV; | 776 | return -ENODEV; |