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

rafaeljw · rafaeljw · commit 6df609b24b23 · 2017-07-14T13:16:31.000+02:00
* 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()
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
@@ -272,6 +272,8 @@ static ssize_t pm_qos_latency_tolerance_store(struct device *dev,
 			value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT;
 		else if (!strcmp(buf, "any") || !strcmp(buf, "any\n"))
 			value = PM_QOS_LATENCY_ANY;
+		else
+			return -EINVAL;
 	}
 	ret = dev_pm_qos_update_user_latency_tolerance(dev, value);
 	return ret < 0 ? ret : n;
diff --git a/drivers/devfreq/governor_userspace.c b/drivers/devfreq/governor_userspace.c
@@ -86,7 +86,7 @@ static struct attribute *dev_entries[] = {
 	&dev_attr_set_freq.attr,
 	NULL,
 };
-static struct attribute_group dev_attr_group = {
+static const struct attribute_group dev_attr_group = {
 	.name	= "userspace",
 	.attrs	= dev_entries,
 };
diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
@@ -336,8 +336,9 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
-		dev_err(&pdev->dev, "Cannot get the dmc interrupt resource\n");
-		return -EINVAL;
+		dev_err(&pdev->dev,
+			"Cannot get the dmc interrupt resource: %d\n", irq);
+		return irq;
 	}
 	data = devm_kzalloc(dev, sizeof(struct rk3399_dmcfreq), GFP_KERNEL);
 	if (!data)
diff --git a/drivers/devfreq/tegra-devfreq.c b/drivers/devfreq/tegra-devfreq.c
@@ -688,9 +688,9 @@ static int tegra_devfreq_probe(struct platform_device *pdev)
 	}
 
 	irq = platform_get_irq(pdev, 0);
-	if (irq <= 0) {
-		dev_err(&pdev->dev, "Failed to get IRQ\n");
-		return -ENODEV;
+	if (irq < 0) {
+		dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
 	}
 
 	platform_set_drvdata(pdev, tegra);

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,8 @@ static ssize_t pm_qos_latency_tolerance_store(struct device *dev,`
`272`	`272`	`value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT;`
`273`	`273`	`else if (!strcmp(buf, "any") \|\| !strcmp(buf, "any\n"))`
`274`	`274`	`value = PM_QOS_LATENCY_ANY;`
	`275`	`+ else`
	`276`	`+ return -EINVAL;`
`275`	`277`	`}`
`276`	`278`	`ret = dev_pm_qos_update_user_latency_tolerance(dev, value);`
`277`	`279`	`return ret < 0 ? ret : n;`
Original file line number	Diff line number	Diff line change
`@@ -688,9 +688,9 @@ static int tegra_devfreq_probe(struct platform_device *pdev)`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`irq = platform_get_irq(pdev, 0);`
`691`		`- if (irq <= 0) {`
`692`		`- dev_err(&pdev->dev, "Failed to get IRQ\n");`
`693`		`- return -ENODEV;`
	`691`	`+ if (irq < 0) {`
	`692`	`+ dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);`
	`693`	`+ return irq;`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`platform_set_drvdata(pdev, tegra);`