aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-23 02:27:54 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-01-23 03:02:36 -0500
commit69898e512a4c27017aec43796bef8fe1dd1ec661 (patch)
treefe0d574d9cbddff98fee925546dff699ade05b8f /drivers/input/keyboard
parent409e15442fc7f7ae9d025f3ea3fdf3c60070314f (diff)
Input: samsung-keypad - don't synchronise with runtime PM put
We don't actually care if the device has been runtime suspended immediately so we can just drop the reference without waiting for any state change to be implemented. This may allow us to avoid some suspend/resume cycles and is a bit more friendly to the rest of the system. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/samsung-keypad.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index b746fce2d12..395b3af9f73 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -178,7 +178,7 @@ static irqreturn_t samsung_keypad_irq(int irq, void *dev_id)
178 178
179 } while (key_down && !keypad->stopped); 179 } while (key_down && !keypad->stopped);
180 180
181 pm_runtime_put_sync(&keypad->pdev->dev); 181 pm_runtime_put(&keypad->pdev->dev);
182 182
183 return IRQ_HANDLED; 183 return IRQ_HANDLED;
184} 184}
@@ -202,7 +202,7 @@ static void samsung_keypad_start(struct samsung_keypad *keypad)
202 /* KEYIFCOL reg clear. */ 202 /* KEYIFCOL reg clear. */
203 writel(0, keypad->base + SAMSUNG_KEYIFCOL); 203 writel(0, keypad->base + SAMSUNG_KEYIFCOL);
204 204
205 pm_runtime_put_sync(&keypad->pdev->dev); 205 pm_runtime_put(&keypad->pdev->dev);
206} 206}
207 207
208static void samsung_keypad_stop(struct samsung_keypad *keypad) 208static void samsung_keypad_stop(struct samsung_keypad *keypad)
@@ -232,7 +232,7 @@ static void samsung_keypad_stop(struct samsung_keypad *keypad)
232 */ 232 */
233 enable_irq(keypad->irq); 233 enable_irq(keypad->irq);
234 234
235 pm_runtime_put_sync(&keypad->pdev->dev); 235 pm_runtime_put(&keypad->pdev->dev);
236} 236}
237 237
238static int samsung_keypad_open(struct input_dev *input_dev) 238static int samsung_keypad_open(struct input_dev *input_dev)