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

clk: mvebu: ap806: cosmetic improvement 

Instead of using &pdev->dev all over the place, introduce a pointer
variable for it.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/5a55e081d96fc6d2a28331b59df90f56d32a9f24.1496239589.git-series.gregory.clement@free-electrons.com
This commit is contained in:
Gregory CLEMENT 2017-05-31 16:07:22 +02:00 committed by Michael Turquette
parent 7e5b11afec
commit d9ff21eea1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/clk/mvebu/ap806-system-controller.c
View File

@ -36,20 +36,21 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev)
{ {
unsigned int freq_mode, cpuclk_freq; unsigned int freq_mode, cpuclk_freq;
const char *name, *fixedclk_name; const char *name, *fixedclk_name;
struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct regmap *regmap; struct regmap *regmap;
u32 reg; u32 reg;
int ret; int ret;
regmap = syscon_node_to_regmap(np); regmap = syscon_node_to_regmap(np);
if (IS_ERR(regmap)) { if (IS_ERR(regmap)) {
dev_err(&pdev->dev, "cannot get regmap\n"); dev_err(dev, "cannot get regmap\n");
return PTR_ERR(regmap); return PTR_ERR(regmap);
} }
ret = regmap_read(regmap, AP806_SAR_REG, &reg); ret = regmap_read(regmap, AP806_SAR_REG, &reg);
if (ret) { if (ret) {
dev_err(&pdev->dev, "cannot read from regmap\n"); dev_err(dev, "cannot read from regmap\n");
return ret; return ret;
} }
@ -89,7 +90,7 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev)
cpuclk_freq = 600; cpuclk_freq = 600;
break; break;
default: default:
dev_err(&pdev->dev, "invalid SAR value\n"); dev_err(dev, "invalid SAR value\n");
return -EINVAL; return -EINVAL;
} }
@ -99,7 +100,7 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev)
/* CPU clocks depend on the Sample At Reset configuration */ /* CPU clocks depend on the Sample At Reset configuration */
of_property_read_string_index(np, "clock-output-names", of_property_read_string_index(np, "clock-output-names",
0, &name); 0, &name);
ap806_clks[0] = clk_register_fixed_rate(&pdev->dev, name, NULL, ap806_clks[0] = clk_register_fixed_rate(dev, name, NULL,
0, cpuclk_freq); 0, cpuclk_freq);
if (IS_ERR(ap806_clks[0])) { if (IS_ERR(ap806_clks[0])) {
ret = PTR_ERR(ap806_clks[0]); ret = PTR_ERR(ap806_clks[0]);
@ -108,7 +109,7 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev)
of_property_read_string_index(np, "clock-output-names", of_property_read_string_index(np, "clock-output-names",
1, &name); 1, &name);
ap806_clks[1] = clk_register_fixed_rate(&pdev->dev, name, NULL, 0, ap806_clks[1] = clk_register_fixed_rate(dev, name, NULL, 0,
cpuclk_freq); cpuclk_freq);
if (IS_ERR(ap806_clks[1])) { if (IS_ERR(ap806_clks[1])) {
ret = PTR_ERR(ap806_clks[1]); ret = PTR_ERR(ap806_clks[1]);
@ -118,7 +119,7 @@ static int ap806_syscon_clk_probe(struct platform_device *pdev)
/* Fixed clock is always 1200 Mhz */ /* Fixed clock is always 1200 Mhz */
of_property_read_string_index(np, "clock-output-names", of_property_read_string_index(np, "clock-output-names",
2, &fixedclk_name); 2, &fixedclk_name);
ap806_clks[2] = clk_register_fixed_rate(&pdev->dev, fixedclk_name, NULL, ap806_clks[2] = clk_register_fixed_rate(dev, fixedclk_name, NULL,
0, 1200 * 1000 * 1000); 0, 1200 * 1000 * 1000);
if (IS_ERR(ap806_clks[2])) { if (IS_ERR(ap806_clks[2])) {
ret = PTR_ERR(ap806_clks[2]); ret = PTR_ERR(ap806_clks[2]);