* [PATCH] mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
@ 2014-12-03 13:43 Ludovic Desroches
2014-12-03 14:23 ` Ulf Hansson
2014-12-05 8:52 ` Ulf Hansson
0 siblings, 2 replies; 4+ messages in thread
From: Ludovic Desroches @ 2014-12-03 13:43 UTC (permalink / raw)
To: linux-mmc, linux-arm-kernel; +Cc: ulf.hansson, nicolas.ferre, Ludovic Desroches
Use SET_RUNTIME_PM_OPS() since SET_PM_RUNTIME_PM_OPS() has been dropped.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
Hi Ulf,
Can you take this patch which fixes a compilation error that has appeared only
on next-20141203.
Thanks
Regards
drivers/mmc/host/atmel-mci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 62aba9a..03d7c75 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2561,7 +2561,7 @@ static int atmci_runtime_resume(struct device *dev)
static const struct dev_pm_ops atmci_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
pm_runtime_force_resume)
- SET_PM_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
};
static struct platform_driver atmci_driver = {
--
2.0.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
2014-12-03 13:43 [PATCH] mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro Ludovic Desroches
@ 2014-12-03 14:23 ` Ulf Hansson
2014-12-04 10:33 ` Ludovic Desroches
2014-12-05 8:52 ` Ulf Hansson
1 sibling, 1 reply; 4+ messages in thread
From: Ulf Hansson @ 2014-12-03 14:23 UTC (permalink / raw)
To: Ludovic Desroches
Cc: linux-mmc, linux-arm-kernel, Nicolas Ferre, Rafael J. Wysocki
+Rafael
On 3 December 2014 at 14:43, Ludovic Desroches
<ludovic.desroches@atmel.com> wrote:
> Use SET_RUNTIME_PM_OPS() since SET_PM_RUNTIME_PM_OPS() has been dropped.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> ---
>
> Hi Ulf,
>
> Can you take this patch which fixes a compilation error that has appeared only
> on next-20141203.
I would prefer if the fix could be done through Rafael's tree, since
it's a commit from there that causes the build error.
I have already shared an immutable branch containing the mmc commit,
which is in conflict with the change in Rafael's linux-pm tree.
Kind regards
Uffe
>
> Thanks
>
> Regards
>
> drivers/mmc/host/atmel-mci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 62aba9a..03d7c75 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2561,7 +2561,7 @@ static int atmci_runtime_resume(struct device *dev)
> static const struct dev_pm_ops atmci_dev_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> pm_runtime_force_resume)
> - SET_PM_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
> + SET_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
> };
>
> static struct platform_driver atmci_driver = {
> --
> 2.0.3
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
2014-12-03 14:23 ` Ulf Hansson
@ 2014-12-04 10:33 ` Ludovic Desroches
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Desroches @ 2014-12-04 10:33 UTC (permalink / raw)
To: Ulf Hansson
Cc: Ludovic Desroches, linux-mmc, linux-arm-kernel, Nicolas Ferre,
Rafael J. Wysocki
Hi Rafael,
Do you agree to take it in your tree?
Regards
Ludovic
On Wed, Dec 03, 2014 at 03:23:12PM +0100, Ulf Hansson wrote:
> +Rafael
>
> On 3 December 2014 at 14:43, Ludovic Desroches
> <ludovic.desroches@atmel.com> wrote:
> > Use SET_RUNTIME_PM_OPS() since SET_PM_RUNTIME_PM_OPS() has been dropped.
> >
> > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> > ---
> >
> > Hi Ulf,
> >
> > Can you take this patch which fixes a compilation error that has appeared only
> > on next-20141203.
>
> I would prefer if the fix could be done through Rafael's tree, since
> it's a commit from there that causes the build error.
>
> I have already shared an immutable branch containing the mmc commit,
> which is in conflict with the change in Rafael's linux-pm tree.
>
> Kind regards
> Uffe
>
> >
> > Thanks
> >
> > Regards
> >
> > drivers/mmc/host/atmel-mci.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> > index 62aba9a..03d7c75 100644
> > --- a/drivers/mmc/host/atmel-mci.c
> > +++ b/drivers/mmc/host/atmel-mci.c
> > @@ -2561,7 +2561,7 @@ static int atmci_runtime_resume(struct device *dev)
> > static const struct dev_pm_ops atmci_dev_pm_ops = {
> > SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> > pm_runtime_force_resume)
> > - SET_PM_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
> > + SET_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
> > };
> >
> > static struct platform_driver atmci_driver = {
> > --
> > 2.0.3
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
2014-12-03 13:43 [PATCH] mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro Ludovic Desroches
2014-12-03 14:23 ` Ulf Hansson
@ 2014-12-05 8:52 ` Ulf Hansson
1 sibling, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2014-12-05 8:52 UTC (permalink / raw)
To: Ludovic Desroches
Cc: linux-mmc, Rafael J. Wysocki, linux-arm-kernel, Nicolas Ferre
On 3 December 2014 at 14:43, Ludovic Desroches
<ludovic.desroches@atmel.com> wrote:
> Use SET_RUNTIME_PM_OPS() since SET_PM_RUNTIME_PM_OPS() has been dropped.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Rafael have solved the issue in linux-next by:
#define SET_PM_RUNTIME_PM_OPS SET_RUNTIME_PM_OPS
For $subject patch, I will queued it up as fix for 3.19 rc[n].
Kind regards
Uffe
> ---
>
> Hi Ulf,
>
> Can you take this patch which fixes a compilation error that has appeared only
> on next-20141203.
>
> Thanks
>
> Regards
>
> drivers/mmc/host/atmel-mci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 62aba9a..03d7c75 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2561,7 +2561,7 @@ static int atmci_runtime_resume(struct device *dev)
> static const struct dev_pm_ops atmci_dev_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> pm_runtime_force_resume)
> - SET_PM_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
> + SET_RUNTIME_PM_OPS(atmci_runtime_suspend, atmci_runtime_resume, NULL)
> };
>
> static struct platform_driver atmci_driver = {
> --
> 2.0.3
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-05 8:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-03 13:43 [PATCH] mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro Ludovic Desroches
2014-12-03 14:23 ` Ulf Hansson
2014-12-04 10:33 ` Ludovic Desroches
2014-12-05 8:52 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).