diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/hitfb.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index 3ae896d55a58..e7116a6d82d3 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c | |||
@@ -429,8 +429,7 @@ static int __exit hitfb_remove(struct platform_device *dev) | |||
429 | return 0; | 429 | return 0; |
430 | } | 430 | } |
431 | 431 | ||
432 | #ifdef CONFIG_PM | 432 | static int hitfb_suspend(struct device *dev) |
433 | static int hitfb_suspend(struct platform_device *dev, pm_message_t state) | ||
434 | { | 433 | { |
435 | u16 v; | 434 | u16 v; |
436 | 435 | ||
@@ -442,7 +441,7 @@ static int hitfb_suspend(struct platform_device *dev, pm_message_t state) | |||
442 | return 0; | 441 | return 0; |
443 | } | 442 | } |
444 | 443 | ||
445 | static int hitfb_resume(struct platform_device *dev) | 444 | static int hitfb_resume(struct device *dev) |
446 | { | 445 | { |
447 | u16 v; | 446 | u16 v; |
448 | 447 | ||
@@ -456,17 +455,19 @@ static int hitfb_resume(struct platform_device *dev) | |||
456 | 455 | ||
457 | return 0; | 456 | return 0; |
458 | } | 457 | } |
459 | #endif | 458 | |
459 | static struct dev_pm_ops hitfb_dev_pm_ops = { | ||
460 | .suspend = hitfb_suspend, | ||
461 | .resume = hitfb_resume, | ||
462 | }; | ||
460 | 463 | ||
461 | static struct platform_driver hitfb_driver = { | 464 | static struct platform_driver hitfb_driver = { |
462 | .probe = hitfb_probe, | 465 | .probe = hitfb_probe, |
463 | .remove = __exit_p(hitfb_remove), | 466 | .remove = __exit_p(hitfb_remove), |
464 | #ifdef CONFIG_PM | ||
465 | .suspend = hitfb_suspend, | ||
466 | .resume = hitfb_resume, | ||
467 | #endif | ||
468 | .driver = { | 467 | .driver = { |
469 | .name = "hitfb", | 468 | .name = "hitfb", |
469 | .owner = THIS_MODULE, | ||
470 | .pm = &hitfb_dev_pm_ops, | ||
470 | }, | 471 | }, |
471 | }; | 472 | }; |
472 | 473 | ||