Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 53a2b81c4e659d894aadc56715c8d8a9afa60d67

Authored by Dmitry Torokhov
1 parent 64dcddd888
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Input: tc3589x-keypad - fix 'double const' warning 

Also rearrange driver structure initializer a bit.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Showing 1 changed file with 11 additions and 11 deletions Side-by-side Diff

drivers/input/keyboard/tc3589x-keypad.c
Diff comments   View file @ 53a2b81
... ... @@ -402,7 +402,7 @@
402 402 return 0;
403 403 }
404 404  
405   -#ifdef CONFIG_PM
  405 +#ifdef CONFIG_PM_SLEEP
406 406 static int tc3589x_keypad_suspend(struct device *dev)
407 407 {
408 408 struct platform_device *pdev = to_platform_device(dev);
409 409  
410 410  
... ... @@ -439,19 +439,19 @@
439 439  
440 440 return 0;
441 441 }
442   -
443   -static const SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops,
444   - tc3589x_keypad_suspend, tc3589x_keypad_resume);
445 442 #endif
446 443  
  444 +static SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops,
  445 + tc3589x_keypad_suspend, tc3589x_keypad_resume);
  446 +
447 447 static struct platform_driver tc3589x_keypad_driver = {
448   - .driver.name = "tc3589x-keypad",
449   - .driver.owner = THIS_MODULE,
450   -#ifdef CONFIG_PM
451   - .driver.pm = &tc3589x_keypad_dev_pm_ops,
452   -#endif
453   - .probe = tc3589x_keypad_probe,
454   - .remove = __devexit_p(tc3589x_keypad_remove),
  448 + .driver = {
  449 + .name = "tc3589x-keypad",
  450 + .owner = THIS_MODULE,
  451 + .pm = &tc3589x_keypad_dev_pm_ops,
  452 + },
  453 + .probe = tc3589x_keypad_probe,
  454 + .remove = __devexit_p(tc3589x_keypad_remove),
455 455 };
456 456  
457 457 static int __init tc3589x_keypad_init(void)