浏览代码

Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq

Pull devfreq changes for v4.13 from MyungJoo Ham.

* 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/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()
Rafael J. Wysocki 8 年之前
父节点
当前提交
20dd95ef0e
共有 3 个文件被更改,包括 7 次插入6 次删除
  1. 1 1
      drivers/devfreq/governor_userspace.c
  2. 3 2
      drivers/devfreq/rk3399_dmc.c
  3. 3 3
      drivers/devfreq/tegra-devfreq.c

+ 1 - 1
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,
 };

+ 3 - 2
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)

+ 3 - 3
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);