openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: dwc3: Use devres to get clocks 

Use devres to get clocks and drop explicit clock freeing. No
functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Andrey Smirnov 2019-07-12 00:26:33 -07:00 committed by Felipe Balbi
parent 3cd703f483
commit 03bf32bbb6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/dwc3/core.c
View File

@ -1448,7 +1448,7 @@ static int dwc3_probe(struct platform_device *pdev)
if (dev->of_node) { if (dev->of_node) {
dwc->num_clks = ARRAY_SIZE(dwc3_core_clks); dwc->num_clks = ARRAY_SIZE(dwc3_core_clks);
ret = clk_bulk_get(dev, dwc->num_clks, dwc->clks); ret = devm_clk_bulk_get(dev, dwc->num_clks, dwc->clks);
if (ret == -EPROBE_DEFER) if (ret == -EPROBE_DEFER)
return ret; return ret;
/* /*
@ -1461,7 +1461,7 @@ static int dwc3_probe(struct platform_device *pdev)
ret = reset_control_deassert(dwc->reset); ret = reset_control_deassert(dwc->reset);
if (ret) if (ret)
goto put_clks; return ret;
ret = clk_bulk_prepare(dwc->num_clks, dwc->clks); ret = clk_bulk_prepare(dwc->num_clks, dwc->clks);
if (ret) if (ret)
@ -1548,8 +1548,6 @@ static int dwc3_probe(struct platform_device *pdev)
clk_bulk_unprepare(dwc->num_clks, dwc->clks); clk_bulk_unprepare(dwc->num_clks, dwc->clks);
assert_reset: assert_reset:
reset_control_assert(dwc->reset); reset_control_assert(dwc->reset);
put_clks:
clk_bulk_put(dwc->num_clks, dwc->clks);
return ret; return ret;
} }
@ -1572,7 +1570,6 @@ static int dwc3_remove(struct platform_device *pdev)
dwc3_free_event_buffers(dwc); dwc3_free_event_buffers(dwc);
dwc3_free_scratch_buffers(dwc); dwc3_free_scratch_buffers(dwc);
clk_bulk_put(dwc->num_clks, dwc->clks);
return 0; return 0;
} }