Advertisement
Guest User

Untitled

a guest
Nov 7th, 2013
90
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.55 KB | None | 0 0
  1. diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
  2. index f15cdb9..033317c 100644
  3. --- a/arch/arm/common/edma.c
  4. +++ b/arch/arm/common/edma.c
  5. @@ -1809,6 +1809,7 @@ static int edma_pm_suspend(struct device *dev)
  6.  
  7. pm_runtime_put_sync(dev);
  8.  
  9. + dev_err(dev, "%s\n", __func__);
  10. return 0;
  11. }
  12.  
  13. @@ -1861,10 +1862,25 @@ static int edma_pm_resume(struct device *dev)
  14.  
  15. pm_runtime_put_sync(dev);
  16.  
  17. + dev_err(dev, "%s\n", __func__);
  18. return 0;
  19. }
  20.  
  21. +#if 1
  22. static SIMPLE_DEV_PM_OPS(edma_pm_ops, edma_pm_suspend, edma_pm_resume);
  23. +#endif
  24. +#if 0
  25. +static const struct dev_pm_ops edma_pm_ops = {
  26. + .suspend_noirq = edma_pm_suspend,
  27. + .resume_noirq = edma_pm_resume,
  28. +};
  29. +#endif
  30. +#if 0
  31. +static const struct dev_pm_ops edma_pm_ops = {
  32. + .suspend_late = edma_pm_suspend,
  33. + .resume_early = edma_pm_resume,
  34. +};
  35. +#endif
  36.  
  37. static struct platform_driver edma_driver = {
  38. .driver = {
  39. diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
  40. index d4620a2..b917214 100644
  41. --- a/arch/arm/mach-omap2/omap_device.c
  42. +++ b/arch/arm/mach-omap2/omap_device.c
  43. @@ -629,6 +629,7 @@ static int _od_suspend_noirq(struct device *dev)
  44. }
  45. }
  46.  
  47. + dev_err(dev, "%s: suspended\n", __func__);
  48. return ret;
  49. }
  50.  
  51. @@ -649,6 +650,7 @@ static int _od_resume_noirq(struct device *dev)
  52. pm_generic_runtime_resume(dev);
  53. }
  54.  
  55. + dev_err(dev, "%s: resumed\n", __func__);
  56. return pm_generic_resume_noirq(dev);
  57. }
  58. #else
  59. diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
  60. index 9f098a8..11d5f0f 100644
  61. --- a/drivers/base/power/main.c
  62. +++ b/drivers/base/power/main.c
  63. @@ -518,6 +518,7 @@ static int device_resume_early(struct device *dev, pm_message_t state)
  64. Out:
  65. TRACE_RESUME(error);
  66.  
  67. + dev_err(dev, "%s enable\n", __func__);
  68. pm_runtime_enable(dev);
  69. return error;
  70. }
  71. @@ -762,6 +763,7 @@ static void device_complete(struct device *dev, pm_message_t state)
  72.  
  73. device_unlock(dev);
  74.  
  75. + dev_err(dev, "%s put\n", __func__);
  76. pm_runtime_put(dev);
  77. }
  78.  
  79. @@ -934,6 +936,7 @@ static int device_suspend_late(struct device *dev, pm_message_t state)
  80. pm_callback_t callback = NULL;
  81. char *info = NULL;
  82.  
  83. + dev_err(dev, "%s disable\n", __func__);
  84. __pm_runtime_disable(dev, false);
  85.  
  86. if (dev->power.syscore)
  87. @@ -1245,6 +1248,7 @@ static int device_prepare(struct device *dev, pm_message_t state)
  88. * block runtime suspend here, during the prepare phase, and allow
  89. * it again during the complete phase.
  90. */
  91. + dev_err(dev, "%s get\n", __func__);
  92. pm_runtime_get_noresume(dev);
  93.  
  94. device_lock(dev);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement