| Message ID | 1430334615-1161-6-git-send-email-ahaslam@baylibre.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Wed, Apr 29, 2015 at 9:10 PM, <ahaslam@baylibre.com> wrote: > Now that all known users have been converted to use the state > version of the callbacks, we can remove the default callbacks > without breaking compilation. You forgot to update the one-line summary and the full description: the callbacks are no longer removed, only the latencies. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Apr 30, 2015 at 9:21 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Wed, Apr 29, 2015 at 9:10 PM, <ahaslam@baylibre.com> wrote: >> Now that all known users have been converted to use the state >> version of the callbacks, we can remove the default callbacks >> without breaking compilation. > > You forgot to update the one-line summary and the full description: > the callbacks are no longer removed, only the latencies. right, i will update the comment. thanks, Axel > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-pm" 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/base/power/domain.c b/drivers/base/power/domain.c index 4ea1365..30bff3f 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1510,21 +1510,6 @@ static int genpd_alloc_states_data(struct generic_pm_domain *genpd, st[i].power_off_latency_ns; } - /* - * Copy the latency values To keep compatibility with - * platfroms that are not converted to use the multiple states. - * This will be removed once all platfroms are converted to use - * multiple states. note that non converted platfroms will use the - * default single off state. - */ - if (genpd->power_on_latency_ns != 0) - genpd->states[0].power_on_latency_ns = - genpd->power_on_latency_ns; - - if (genpd->power_off_latency_ns != 0) - genpd->states[0].power_off_latency_ns = - genpd->power_off_latency_ns; - genpd->state_count = st_count; /* to save memory, Name allocation will happen if debug is enabled */ diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 8a3d43f..935984f 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -73,9 +73,7 @@ struct generic_pm_domain { unsigned int prepared_count; /* Suspend counter of prepared devices */ bool suspend_power_off; /* Power status before system suspend */ int (*power_off)(struct generic_pm_domain *domain); - s64 power_off_latency_ns; int (*power_on)(struct generic_pm_domain *domain); - s64 power_on_latency_ns; struct gpd_dev_ops dev_ops; s64 max_off_time_ns; /* Maximum allowed "suspended" time. */ bool max_off_time_changed;