diff for duplicates of <201112010020.15845.rjw@sisk.pl> diff --git a/a/1.txt b/N1/1.txt index cf535bf..eba3be8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,8 @@ Rafael 5 files changed, 154 insertions(+), 28 deletions(-) Index: linux/include/linux/pm.h -=================================--- linux.orig/include/linux/pm.h +=================================================================== +--- linux.orig/include/linux/pm.h +++ linux/include/linux/pm.h @@ -521,6 +521,8 @@ struct dev_pm_info { unsigned long active_jiffies; @@ -58,7 +59,8 @@ Index: linux/include/linux/pm.h struct pm_subsys_data *subsys_data; /* Owned by the subsystem. */ struct pm_qos_constraints *constraints; Index: linux/drivers/base/power/runtime.c -=================================--- linux.orig/drivers/base/power/runtime.c +=================================================================== +--- linux.orig/drivers/base/power/runtime.c +++ linux/drivers/base/power/runtime.c @@ -279,6 +279,47 @@ static int rpm_callback(int (*cb)(struct return retval != -EACCES ? retval : -EIO; @@ -96,7 +98,7 @@ Index: linux/drivers/base/power/runtime.c + goto out; + } + -+ if (qos->constraint_ns > delta_ns || qos->constraint_ns = 0) ++ if (qos->constraint_ns > delta_ns || qos->constraint_ns == 0) + qos->constraint_ns = delta_ns; + + out: @@ -162,7 +164,7 @@ Index: linux/drivers/base/power/runtime.c - if (retval) { - __update_runtime_status(dev, RPM_ACTIVE); - dev->power.deferred_resume = false; -- if (retval = -EAGAIN || retval = -EBUSY) { +- if (retval == -EAGAIN || retval == -EBUSY) { - dev->power.runtime_error = 0; + if (retval) + goto fail; @@ -195,7 +197,7 @@ Index: linux/drivers/base/power/runtime.c + dev->power.suspend_time = ktime_set(0, 0); + dev->power.max_time_suspended_ns = -1; + dev->power.deferred_resume = false; -+ if (retval = -EAGAIN || retval = -EBUSY) { ++ if (retval == -EAGAIN || retval == -EBUSY) { + dev->power.runtime_error = 0; + + /* @@ -265,7 +267,8 @@ Index: linux/drivers/base/power/runtime.c + spin_unlock_irqrestore(&dev->power.lock, flags); +} Index: linux/include/linux/pm_runtime.h -=================================--- linux.orig/include/linux/pm_runtime.h +=================================================================== +--- linux.orig/include/linux/pm_runtime.h +++ linux/include/linux/pm_runtime.h @@ -45,6 +45,8 @@ extern void pm_runtime_irq_safe(struct d extern void __pm_runtime_use_autosuspend(struct device *dev, bool use); @@ -287,7 +290,8 @@ Index: linux/include/linux/pm_runtime.h static inline int pm_runtime_idle(struct device *dev) Index: linux/drivers/base/power/qos.c -=================================--- linux.orig/drivers/base/power/qos.c +=================================================================== +--- linux.orig/drivers/base/power/qos.c +++ linux/drivers/base/power/qos.c @@ -47,21 +47,29 @@ static DEFINE_MUTEX(dev_pm_qos_mtx); static BLOCKING_NOTIFIER_HEAD(dev_pm_notifiers); @@ -328,7 +332,8 @@ Index: linux/drivers/base/power/qos.c return ret; Index: linux/include/linux/pm_qos.h -=================================--- linux.orig/include/linux/pm_qos.h +=================================================================== +--- linux.orig/include/linux/pm_qos.h +++ linux/include/linux/pm_qos.h @@ -78,6 +78,7 @@ int pm_qos_remove_notifier(int pm_qos_cl int pm_qos_request_active(struct pm_qos_request *req); diff --git a/a/content_digest b/N1/content_digest index 4b0c841..596bfa5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0201111191500.34517.rjw@sisk.pl\0" "From\0Rafael J. Wysocki <rjw@sisk.pl>\0" "Subject\0[Update 3x][PATCH 4/7] PM / Runtime: Use device PM QoS constraints (v2)\0" - "Date\0Wed, 30 Nov 2011 23:20:15 +0000\0" + "Date\0Thu, 1 Dec 2011 00:20:15 +0100\0" "To\0Linux PM list <linux-pm@vger.kernel.org>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Linux-sh list <linux-sh@vger.kernel.org> @@ -61,7 +61,8 @@ " 5 files changed, 154 insertions(+), 28 deletions(-)\n" "\n" "Index: linux/include/linux/pm.h\n" - "=================================--- linux.orig/include/linux/pm.h\n" + "===================================================================\n" + "--- linux.orig/include/linux/pm.h\n" "+++ linux/include/linux/pm.h\n" "@@ -521,6 +521,8 @@ struct dev_pm_info {\n" " \tunsigned long\t\tactive_jiffies;\n" @@ -73,7 +74,8 @@ " \tstruct pm_subsys_data\t*subsys_data; /* Owned by the subsystem. */\n" " \tstruct pm_qos_constraints *constraints;\n" "Index: linux/drivers/base/power/runtime.c\n" - "=================================--- linux.orig/drivers/base/power/runtime.c\n" + "===================================================================\n" + "--- linux.orig/drivers/base/power/runtime.c\n" "+++ linux/drivers/base/power/runtime.c\n" "@@ -279,6 +279,47 @@ static int rpm_callback(int (*cb)(struct\n" " \treturn retval != -EACCES ? retval : -EIO;\n" @@ -111,7 +113,7 @@ "+\t\tgoto out;\n" "+\t}\n" "+\n" - "+\tif (qos->constraint_ns > delta_ns || qos->constraint_ns = 0)\n" + "+\tif (qos->constraint_ns > delta_ns || qos->constraint_ns == 0)\n" "+\t\tqos->constraint_ns = delta_ns;\n" "+\n" "+ out:\n" @@ -177,7 +179,7 @@ "-\tif (retval) {\n" "-\t\t__update_runtime_status(dev, RPM_ACTIVE);\n" "-\t\tdev->power.deferred_resume = false;\n" - "-\t\tif (retval = -EAGAIN || retval = -EBUSY) {\n" + "-\t\tif (retval == -EAGAIN || retval == -EBUSY) {\n" "-\t\t\tdev->power.runtime_error = 0;\n" "+\tif (retval)\n" "+\t\tgoto fail;\n" @@ -210,7 +212,7 @@ "+\tdev->power.suspend_time = ktime_set(0, 0);\n" "+\tdev->power.max_time_suspended_ns = -1;\n" "+\tdev->power.deferred_resume = false;\n" - "+\tif (retval = -EAGAIN || retval = -EBUSY) {\n" + "+\tif (retval == -EAGAIN || retval == -EBUSY) {\n" "+\t\tdev->power.runtime_error = 0;\n" "+\n" "+\t\t/*\n" @@ -280,7 +282,8 @@ "+\tspin_unlock_irqrestore(&dev->power.lock, flags);\n" "+}\n" "Index: linux/include/linux/pm_runtime.h\n" - "=================================--- linux.orig/include/linux/pm_runtime.h\n" + "===================================================================\n" + "--- linux.orig/include/linux/pm_runtime.h\n" "+++ linux/include/linux/pm_runtime.h\n" "@@ -45,6 +45,8 @@ extern void pm_runtime_irq_safe(struct d\n" " extern void __pm_runtime_use_autosuspend(struct device *dev, bool use);\n" @@ -302,7 +305,8 @@ " \n" " static inline int pm_runtime_idle(struct device *dev)\n" "Index: linux/drivers/base/power/qos.c\n" - "=================================--- linux.orig/drivers/base/power/qos.c\n" + "===================================================================\n" + "--- linux.orig/drivers/base/power/qos.c\n" "+++ linux/drivers/base/power/qos.c\n" "@@ -47,21 +47,29 @@ static DEFINE_MUTEX(dev_pm_qos_mtx);\n" " static BLOCKING_NOTIFIER_HEAD(dev_pm_notifiers);\n" @@ -343,7 +347,8 @@ " \n" " \treturn ret;\n" "Index: linux/include/linux/pm_qos.h\n" - "=================================--- linux.orig/include/linux/pm_qos.h\n" + "===================================================================\n" + "--- linux.orig/include/linux/pm_qos.h\n" "+++ linux/include/linux/pm_qos.h\n" "@@ -78,6 +78,7 @@ int pm_qos_remove_notifier(int pm_qos_cl\n" " int pm_qos_request_active(struct pm_qos_request *req);\n" @@ -363,4 +368,4 @@ " \t\t\t{ return 0; }\n" static inline int dev_pm_qos_add_request(struct device *dev, -957fb646fae98c6aec57613db455e11886a52311f79bf20ab35b7d3b1dc1d5b1 +9b861883ce5bc60d5bf098c6e47d07f5b05d740ff7e1010cf22be4f5e4cea108
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.