| Message ID | 9005734.b9UuUHqyUV@wasted.cogentembedded.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Wed, Jan 21, 2015 at 12:09:46AM +0300, Sergei Shtylyov wrote: > Use SET_RUNTIME_PM_OPS() to initialize the runtime PM method pointers in the > 'struct dev_pm_ops'; since that macro doesn't do anything if CONFIG_PM is > not defined, we have to move #ifdef up to also cover the runtime PM methods > in order to avoid compilation warnings. > Applied both, thanks. Btw shdmac is NOT a subsystem name!!
Hello. On 2/11/2015 4:23 AM, Vinod Koul wrote: >> Use SET_RUNTIME_PM_OPS() to initialize the runtime PM method pointers in the >> 'struct dev_pm_ops'; since that macro doesn't do anything if CONFIG_PM is >> not defined, we have to move #ifdef up to also cover the runtime PM methods >> in order to avoid compilation warnings. > Applied both, thanks. Thanks to you! Will they get into 3.20? > Btw shdmac is NOT a subsystem name!! Sorry, I usually don't add the subsystem names, leaving that to the maintainers who want (or don't want) to do it. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 11, 2015 at 01:47:31PM +0300, Sergei Shtylyov wrote: > Hello. > > On 2/11/2015 4:23 AM, Vinod Koul wrote: > > >>Use SET_RUNTIME_PM_OPS() to initialize the runtime PM method pointers in the > >>'struct dev_pm_ops'; since that macro doesn't do anything if CONFIG_PM is > >>not defined, we have to move #ifdef up to also cover the runtime PM methods > >>in order to avoid compilation warnings. > > >Applied both, thanks. > > Thanks to you! Will they get into 3.20? Yes they are queued up
Index: slave-dma/drivers/dma/sh/shdmac.c =================================================================== --- slave-dma.orig/drivers/dma/sh/shdmac.c +++ slave-dma/drivers/dma/sh/shdmac.c @@ -588,6 +588,7 @@ static void sh_dmae_shutdown(struct plat sh_dmae_ctl_stop(shdev); } +#ifdef CONFIG_PM static int sh_dmae_runtime_suspend(struct device *dev) { return 0; @@ -600,7 +601,6 @@ static int sh_dmae_runtime_resume(struct return sh_dmae_rst(shdev); } -#ifdef CONFIG_PM static int sh_dmae_suspend(struct device *dev) { return 0; @@ -640,8 +640,8 @@ static int sh_dmae_resume(struct device static const struct dev_pm_ops sh_dmae_pm = { .suspend = sh_dmae_suspend, .resume = sh_dmae_resume, - .runtime_suspend = sh_dmae_runtime_suspend, - .runtime_resume = sh_dmae_runtime_resume, + SET_RUNTIME_PM_OPS(sh_dmae_runtime_suspend, sh_dmae_runtime_resume, + NULL) }; static dma_addr_t sh_dmae_slave_addr(struct shdma_chan *schan)
Use SET_RUNTIME_PM_OPS() to initialize the runtime PM method pointers in the 'struct dev_pm_ops'; since that macro doesn't do anything if CONFIG_PM is not defined, we have to move #ifdef up to also cover the runtime PM methods in order to avoid compilation warnings. Based on orignal patch by Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- The patch is against the 'next' branch of Vinod Koul's 'slave-dma.git' repo. drivers/dma/sh/shdmac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html