iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'pm-qos' and 'pm-devfreq'

Browse Source 
* pm-qos:
  PM / QoS: return -EINVAL for bogus strings

* pm-devfreq:
  PM / devfreq: constify attribute_group structures.
  PM / devfreq: tegra: fix error return code in tegra_devfreq_probe()
  PM / devfreq: rk3399_dmc: fix error return code in rk3399_dmcfreq_probe()
This commit is contained in:
Rafael J. Wysocki 2017-07-14 13:16:31 +02:00
commit 6df609b24b
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/power/sysfs.c
View File

@ -272,6 +272,8 @@ static ssize_t pm_qos_latency_tolerance_store(struct device *dev,
value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT; value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT;
else if (!strcmp(buf, "any") || !strcmp(buf, "any\n")) else if (!strcmp(buf, "any") || !strcmp(buf, "any\n"))
value = PM_QOS_LATENCY_ANY; value = PM_QOS_LATENCY_ANY;
else
return -EINVAL;
} }
ret = dev_pm_qos_update_user_latency_tolerance(dev, value); ret = dev_pm_qos_update_user_latency_tolerance(dev, value);
return ret < 0 ? ret : n; return ret < 0 ? ret : n;

2
drivers/devfreq/governor_userspace.c
View File

@ -86,7 +86,7 @@ static struct attribute *dev_entries[] = {
&dev_attr_set_freq.attr, &dev_attr_set_freq.attr,
NULL, NULL,
}; };
static struct attribute_group dev_attr_group = { static const struct attribute_group dev_attr_group = {
.name = "userspace", .name = "userspace",
.attrs = dev_entries, .attrs = dev_entries,
}; };

5
drivers/devfreq/rk3399_dmc.c
View File

@ -336,8 +336,9 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "Cannot get the dmc interrupt resource\n"); dev_err(&pdev->dev,
return -EINVAL; "Cannot get the dmc interrupt resource: %d\n", irq);
return irq;
} }
data = devm_kzalloc(dev, sizeof(struct rk3399_dmcfreq), GFP_KERNEL); data = devm_kzalloc(dev, sizeof(struct rk3399_dmcfreq), GFP_KERNEL);
if (!data) if (!data)

6
drivers/devfreq/tegra-devfreq.c
View File

@ -688,9 +688,9 @@ static int tegra_devfreq_probe(struct platform_device *pdev)
} }
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq <= 0) { if (irq < 0) {
dev_err(&pdev->dev, "Failed to get IRQ\n"); dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
return -ENODEV; return irq;
} }
platform_set_drvdata(pdev, tegra); platform_set_drvdata(pdev, tegra);