diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-15 23:18:00 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-15 23:18:34 -0700 |
| commit | 53a2b81c4e659d894aadc56715c8d8a9afa60d67 (patch) | |
| tree | a7f0f692cfaf285292d222058be9865ba5d5bfc2 /drivers/input/keyboard/tc3589x-keypad.c | |
| parent | Input: tca6416-keypad - suspend/resume wakeup support (diff) | |
| download | linux-dev-53a2b81c4e659d894aadc56715c8d8a9afa60d67.tar.xz linux-dev-53a2b81c4e659d894aadc56715c8d8a9afa60d67.zip | |
Input: tc3589x-keypad - fix 'double const' warning
Also rearrange driver structure initializer a bit.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard/tc3589x-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/tc3589x-keypad.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tc3589x-keypad.c index dbbe761778d2..99122f59e988 100644 --- a/drivers/input/keyboard/tc3589x-keypad.c +++ b/drivers/input/keyboard/tc3589x-keypad.c @@ -402,7 +402,7 @@ static int __devexit tc3589x_keypad_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int tc3589x_keypad_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -439,19 +439,19 @@ static int tc3589x_keypad_resume(struct device *dev) return 0; } - -static const SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops, - tc3589x_keypad_suspend, tc3589x_keypad_resume); #endif +static SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops, + tc3589x_keypad_suspend, tc3589x_keypad_resume); + static struct platform_driver tc3589x_keypad_driver = { - .driver.name = "tc3589x-keypad", - .driver.owner = THIS_MODULE, -#ifdef CONFIG_PM - .driver.pm = &tc3589x_keypad_dev_pm_ops, -#endif - .probe = tc3589x_keypad_probe, - .remove = __devexit_p(tc3589x_keypad_remove), + .driver = { + .name = "tc3589x-keypad", + .owner = THIS_MODULE, + .pm = &tc3589x_keypad_dev_pm_ops, + }, + .probe = tc3589x_keypad_probe, + .remove = __devexit_p(tc3589x_keypad_remove), }; static int __init tc3589x_keypad_init(void) |