clk: intel: Use devm_clk_hw_register() instead of clk_hw_register()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

To ensure that clks are unregistered in case of any failure, use
devm_clk_hw_register() instead of clk_hw_register().

Signed-off-by: Rahul Tanwar <rahul.tanwar@linux.intel.com>
Link: https://lore.kernel.org/r/7ef7009b4e9f986fd6dfbf487c0e85de68a4ba9b.1594880946.git.rahul.tanwar@linux.intel.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Rahul Tanwar and committed by

Stephen Boyd 5 years ago 8529fc0a b3a9e3b9

+5 -5

2 changed files

expand all

drivers

clk

x86

clk-cgu-pll.c

clk-cgu.c

+1 -1

drivers/clk/x86/clk-cgu-pll.c

··· 128 128 pll->hw.init = &init; 129 129 130 130 hw = &pll->hw; 131 - ret = clk_hw_register(dev, hw); 131 + ret = devm_clk_hw_register(dev, hw); 132 132 if (ret) 133 133 return ERR_PTR(ret); 134 134

+4 -4

drivers/clk/x86/clk-cgu.c

··· 119 119 mux->hw.init = &init; 120 120 121 121 hw = &mux->hw; 122 - ret = clk_hw_register(dev, hw); 122 + ret = devm_clk_hw_register(dev, hw); 123 123 if (ret) 124 124 return ERR_PTR(ret); 125 125 ··· 247 247 div->hw.init = &init; 248 248 249 249 hw = &div->hw; 250 - ret = clk_hw_register(dev, hw); 250 + ret = devm_clk_hw_register(dev, hw); 251 251 if (ret) 252 252 return ERR_PTR(ret); 253 253 ··· 361 361 gate->hw.init = &init; 362 362 363 363 hw = &gate->hw; 364 - ret = clk_hw_register(dev, hw); 364 + ret = devm_clk_hw_register(dev, hw); 365 365 if (ret) 366 366 return ERR_PTR(ret); 367 367 ··· 624 624 ddiv->hw.init = &init; 625 625 626 626 hw = &ddiv->hw; 627 - ret = clk_hw_register(dev, hw); 627 + ret = devm_clk_hw_register(dev, hw); 628 628 if (ret) { 629 629 dev_err(dev, "register clk: %s failed!\n", list->name); 630 630 return ret;