| Message ID | 06fc3c3d0a8bca1bce104ca9d6a7d5ff94bdf9ab.1584027085.git.leonard.crestez@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] PM / devfreq: Fix handling dev_pm_qos_remove_request result | expand |
On 3/13/20 12:36 AM, Leonard Crestez wrote: > The dev_pm_qos_remove_request function can return 1 if > "aggregated constraint value has changed" so only negative values should > be reported as errors. > > Fixes: 27dbc542f651 ("PM / devfreq: Use PM QoS for sysfs min/max_freq") > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> > Cc: stable@vger.kernel.org > --- > drivers/devfreq/devfreq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > Changes since v1: > * Add fixes and cc: stable, drop empty line in message. > Link to v1: https://patchwork.kernel.org/patch/11433131/ > > I'm not sure this meet that stable kernel standard of "real bug that > bothers people" because all this fixes is a spurious dev_warn on device > removal. But Sasha Levin's script seem to collect a lot of low-priority > fixes anyway. > > diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > index 5c481ad1cfc7..6fecd11dafdd 100644 > --- a/drivers/devfreq/devfreq.c > +++ b/drivers/devfreq/devfreq.c > @@ -703,17 +703,17 @@ static void devfreq_dev_release(struct device *dev) > dev_warn(dev->parent, > "Failed to remove min_freq notifier: %d\n", err); > > if (dev_pm_qos_request_active(&devfreq->user_max_freq_req)) { > err = dev_pm_qos_remove_request(&devfreq->user_max_freq_req); > - if (err) > + if (err < 0) > dev_warn(dev->parent, > "Failed to remove max_freq request: %d\n", err); > } > if (dev_pm_qos_request_active(&devfreq->user_min_freq_req)) { > err = dev_pm_qos_remove_request(&devfreq->user_min_freq_req); > - if (err) > + if (err < 0) > dev_warn(dev->parent, > "Failed to remove min_freq request: %d\n", err); > } > > if (devfreq->profile->exit) > Applied it. Thanks.
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 5c481ad1cfc7..6fecd11dafdd 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -703,17 +703,17 @@ static void devfreq_dev_release(struct device *dev) dev_warn(dev->parent, "Failed to remove min_freq notifier: %d\n", err); if (dev_pm_qos_request_active(&devfreq->user_max_freq_req)) { err = dev_pm_qos_remove_request(&devfreq->user_max_freq_req); - if (err) + if (err < 0) dev_warn(dev->parent, "Failed to remove max_freq request: %d\n", err); } if (dev_pm_qos_request_active(&devfreq->user_min_freq_req)) { err = dev_pm_qos_remove_request(&devfreq->user_min_freq_req); - if (err) + if (err < 0) dev_warn(dev->parent, "Failed to remove min_freq request: %d\n", err); } if (devfreq->profile->exit)
The dev_pm_qos_remove_request function can return 1 if "aggregated constraint value has changed" so only negative values should be reported as errors. Fixes: 27dbc542f651 ("PM / devfreq: Use PM QoS for sysfs min/max_freq") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Cc: stable@vger.kernel.org --- drivers/devfreq/devfreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changes since v1: * Add fixes and cc: stable, drop empty line in message. Link to v1: https://patchwork.kernel.org/patch/11433131/ I'm not sure this meet that stable kernel standard of "real bug that bothers people" because all this fixes is a spurious dev_warn on device removal. But Sasha Levin's script seem to collect a lot of low-priority fixes anyway.