UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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()
This commit is contained in:
Rafael J. Wysocki 2017-07-12 23:34:39 +02:00
parent 6f7da29041 37d644aa01
commit 20dd95ef0e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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