| Message ID | 1417614194-28409-1-git-send-email-ludovic.desroches@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
+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 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 = {
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(-)