| Message ID | 1504646069-4216-1-git-send-email-jschoenh@amazon.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On Tuesday, September 5, 2017 11:14:29 PM CEST Jan H. Schönherr wrote: > Use the actual function argument for the validation of the request type, > instead of the type field in a fresh (supposedly zero-initialized) > request structure. > > Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de> > --- > drivers/base/power/qos.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c > index f850dae..277d43a 100644 > --- a/drivers/base/power/qos.c > +++ b/drivers/base/power/qos.c > @@ -277,11 +277,11 @@ void dev_pm_qos_constraints_destroy(struct device *dev) > mutex_unlock(&dev_pm_qos_sysfs_mtx); > } > > -static bool dev_pm_qos_invalid_request(struct device *dev, > - struct dev_pm_qos_request *req) > +static bool dev_pm_qos_invalid_req_type(struct device *dev, > + enum dev_pm_qos_req_type type) > { > - return !req || (req->type == DEV_PM_QOS_LATENCY_TOLERANCE > - && !dev->power.set_latency_tolerance); > + return type == DEV_PM_QOS_LATENCY_TOLERANCE && > + !dev->power.set_latency_tolerance; > } > > static int __dev_pm_qos_add_request(struct device *dev, > @@ -290,7 +290,7 @@ static int __dev_pm_qos_add_request(struct device *dev, > { > int ret = 0; > > - if (!dev || dev_pm_qos_invalid_request(dev, req)) > + if (!dev || !req || dev_pm_qos_invalid_req_type(dev, type)) > return -EINVAL; > > if (WARN(dev_pm_qos_request_active(req), > Applied, thanks!
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index f850dae..277d43a 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -277,11 +277,11 @@ void dev_pm_qos_constraints_destroy(struct device *dev) mutex_unlock(&dev_pm_qos_sysfs_mtx); } -static bool dev_pm_qos_invalid_request(struct device *dev, - struct dev_pm_qos_request *req) +static bool dev_pm_qos_invalid_req_type(struct device *dev, + enum dev_pm_qos_req_type type) { - return !req || (req->type == DEV_PM_QOS_LATENCY_TOLERANCE - && !dev->power.set_latency_tolerance); + return type == DEV_PM_QOS_LATENCY_TOLERANCE && + !dev->power.set_latency_tolerance; } static int __dev_pm_qos_add_request(struct device *dev, @@ -290,7 +290,7 @@ static int __dev_pm_qos_add_request(struct device *dev, { int ret = 0; - if (!dev || dev_pm_qos_invalid_request(dev, req)) + if (!dev || !req || dev_pm_qos_invalid_req_type(dev, type)) return -EINVAL; if (WARN(dev_pm_qos_request_active(req),
Use the actual function argument for the validation of the request type, instead of the type field in a fresh (supposedly zero-initialized) request structure. Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de> --- drivers/base/power/qos.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)