| Message ID | 1502190857-3762-1-git-send-email-doug.lkml@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 8 August 2017 at 13:14, Doug Wilson <doug.lkml@gmail.com> wrote: > dev_pm_ops is not supposed to change at runtime. Marking it > constant. > > Signed-off-by: Doug Wilson <doug.wilson@gmail.com> This doesn't apply on my next branch, please re-base it. Kind regards Uffe > --- > drivers/mmc/host/omap_hsmmc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index 04ff3c9..a280c7f 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -2322,7 +2322,7 @@ static int omap_hsmmc_runtime_resume(struct device *dev) > return 0; > } > > -static struct dev_pm_ops omap_hsmmc_dev_pm_ops = { > +static const struct dev_pm_ops omap_hsmmc_dev_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(omap_hsmmc_suspend, omap_hsmmc_resume) > .runtime_suspend = omap_hsmmc_runtime_suspend, > .runtime_resume = omap_hsmmc_runtime_resume, > -- > 2.7.4 > -- 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
>> >> Signed-off-by: Doug Wilson <doug.wilson@gmail.com> > > This doesn't apply on my next branch, please re-base it. is this your next-branch :kernel/git/ulfh/mmc.git ? - Doug >> >> -static struct dev_pm_ops omap_hsmmc_dev_pm_ops = { >> +static const struct dev_pm_ops omap_hsmmc_dev_pm_ops = { >> SET_SYSTEM_SLEEP_PM_OPS(omap_hsmmc_suspend, omap_hsmmc_resume) >> .runtime_suspend = omap_hsmmc_runtime_suspend, >> .runtime_resume = omap_hsmmc_runtime_resume, >> -- >> 2.7.4 >> -- 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 8 August 2017 at 13:39, Doug Wilson <doug.lkml@gmail.com> wrote: >>> >>> Signed-off-by: Doug Wilson <doug.wilson@gmail.com> >> >> This doesn't apply on my next branch, please re-base it. > > is this your next-branch :kernel/git/ulfh/mmc.git ? Correct! -- 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
>> >> is this your next-branch :kernel/git/ulfh/mmc.git ? > > Correct! The fix is already in your tree. I think you can ignore this patch. - Doug. -- 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/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 04ff3c9..a280c7f 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2322,7 +2322,7 @@ static int omap_hsmmc_runtime_resume(struct device *dev) return 0; } -static struct dev_pm_ops omap_hsmmc_dev_pm_ops = { +static const struct dev_pm_ops omap_hsmmc_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(omap_hsmmc_suspend, omap_hsmmc_resume) .runtime_suspend = omap_hsmmc_runtime_suspend, .runtime_resume = omap_hsmmc_runtime_resume,
dev_pm_ops is not supposed to change at runtime. Marking it constant. Signed-off-by: Doug Wilson <doug.wilson@gmail.com> --- drivers/mmc/host/omap_hsmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)