Skip to contentSkip to conversation

Input: pxa27x-keypad - add clk_prepare/clk_unprepare calls

PATCH New Philipp Zabel 1 participant 1 message Mar 15, 2012

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Philipp Zabel

author
#0 lore raw

PATCH 1/1 Input: pxa27x-keypad - add clk_prepare/clk_unprepare calls

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 <[email protected]>
Cc Dmitry Torokhov <[email protected]>
---
 drivers/input/keyboard/pxa27x_keypad.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/input/keyboard/pxa27x_keypad.c +4 -4
index 29fe1b2..4acb7b9 100644
@@ -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);
 	}
Signature · 1 line
1.7.9.1