forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/drivers/clk/davinci/pll.c
....@@ -373,7 +373,7 @@
373373 char pllout_name[MAX_NAME_SIZE];
374374 char postdiv_name[MAX_NAME_SIZE];
375375 char pllen_name[MAX_NAME_SIZE];
376
- struct clk_init_data init = {};
376
+ struct clk_init_data init;
377377 struct davinci_pll_clk *pllout;
378378 struct davinci_pllen_clk *pllen;
379379 struct clk *oscin_clk = NULL;
....@@ -651,7 +651,7 @@
651651 pllcmd = readl(pll->base + PLLCMD);
652652 pllcmd |= PLLCMD_GOSET;
653653 writel(pllcmd, pll->base + PLLCMD);
654
- /* fallthrough */
654
+ fallthrough;
655655 case PRE_RATE_CHANGE:
656656 /* Wait until for outstanding changes to take effect */
657657 do {
....@@ -778,12 +778,15 @@
778778 int i;
779779
780780 clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
781
- if (!clk_data)
781
+ if (!clk_data) {
782
+ of_node_put(child);
782783 return -ENOMEM;
784
+ }
783785
784786 clks = kmalloc_array(n_clks, sizeof(*clks), GFP_KERNEL);
785787 if (!clks) {
786788 kfree(clk_data);
789
+ of_node_put(child);
787790 return -ENOMEM;
788791 }
789792
....@@ -907,7 +910,6 @@
907910 struct davinci_pll_platform_data *pdata;
908911 const struct of_device_id *of_id;
909912 davinci_pll_init pll_init = NULL;
910
- struct resource *res;
911913 void __iomem *base;
912914
913915 of_id = of_match_device(davinci_pll_of_match, dev);
....@@ -927,8 +929,7 @@
927929 return -EINVAL;
928930 }
929931
930
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
931
- base = devm_ioremap_resource(dev, res);
932
+ base = devm_platform_ioremap_resource(pdev, 0);
932933 if (IS_ERR(base))
933934 return PTR_ERR(base);
934935