All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Input: pxa27x-keypad - add clk_prepare/clk_unprepare calls
@ 2012-03-15 18:10 Philipp Zabel
  0 siblings, 0 replies; only message in thread
From: Philipp Zabel @ 2012-03-15 18:10 UTC (permalink / raw)
  To: linux-input; +Cc: Dmitry Torokhov

This patch adds clk_prepare/clk_unprepare calls to the pxa27x_keypad
driver by using the helper functions clk_prepare_enable and
clk_disable_unprepare.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/keyboard/pxa27x_keypad.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 29fe1b2..4acb7b9 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -399,7 +399,7 @@ static int pxa27x_keypad_open(struct input_dev *dev)
 	struct pxa27x_keypad *keypad = input_get_drvdata(dev);
 
 	/* Enable unit clock */
-	clk_enable(keypad->clk);
+	clk_prepare_enable(keypad->clk);
 	pxa27x_keypad_config(keypad);
 
 	return 0;
@@ -410,7 +410,7 @@ static void pxa27x_keypad_close(struct input_dev *dev)
 	struct pxa27x_keypad *keypad = input_get_drvdata(dev);
 
 	/* Disable clock unit */
-	clk_disable(keypad->clk);
+	clk_disable_unprepare(keypad->clk);
 }
 
 #ifdef CONFIG_PM
@@ -419,7 +419,7 @@ static int pxa27x_keypad_suspend(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
 
-	clk_disable(keypad->clk);
+	clk_disable_unprepare(keypad->clk);
 
 	if (device_may_wakeup(&pdev->dev))
 		enable_irq_wake(keypad->irq);
@@ -440,7 +440,7 @@ static int pxa27x_keypad_resume(struct device *dev)
 
 	if (input_dev->users) {
 		/* Enable unit clock */
-		clk_enable(keypad->clk);
+		clk_prepare_enable(keypad->clk);
 		pxa27x_keypad_config(keypad);
 	}
 
-- 
1.7.9.1



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-03-15 18:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-15 18:10 [PATCH] Input: pxa27x-keypad - add clk_prepare/clk_unprepare calls Philipp Zabel

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.