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

Also rearrange driver structure initializer a bit.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

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,17 +439,17 @@ static int tc3589x_keypad_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
-static const SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops,
+static SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops,
 			 tc3589x_keypad_suspend, tc3589x_keypad_resume);
-#endif
 
 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
+	.driver	= {
+		.name	= "tc3589x-keypad",
+		.owner	= THIS_MODULE,
+		.pm	= &tc3589x_keypad_dev_pm_ops,
+	},
 	.probe	= tc3589x_keypad_probe,
 	.remove	= __devexit_p(tc3589x_keypad_remove),
 };