diff options
| author | Suman Anna <s-anna@ti.com> | 2019-06-26 01:33:15 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-08-13 12:38:37 +0200 |
| commit | a304f483b6b00d42bde41c45ca52c670945348e2 (patch) | |
| tree | ddc81052fed63c085e45e223c96b5ec3e6177c4f | |
| parent | ARM: dts: Fix incorrect dcan register mapping for am3, am4 and dra7 (diff) | |
| download | linux-a304f483b6b00d42bde41c45ca52c670945348e2.tar.xz linux-a304f483b6b00d42bde41c45ca52c670945348e2.zip | |
bus: ti-sysc: Simplify cleanup upon failures in sysc_probe()
The clocks are not yet parsed and prepared until after a successful
sysc_get_clocks(), so there is no need to unprepare the clocks upon
any failure of any of the prior functions in sysc_probe(). The current
code path would have been a no-op because of the clock validity checks
within sysc_unprepare(), but let's just simplify the cleanup path by
returning the error directly.
While at this, also fix the cleanup path for a sysc_init_resets()
failure which is executed after the clocks are prepared.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | drivers/bus/ti-sysc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index a319e1a748fe..2db474ab4c6b 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -2383,27 +2383,27 @@ static int sysc_probe(struct platform_device *pdev) error = sysc_init_dts_quirks(ddata); if (error) - goto unprepare; + return error; error = sysc_map_and_check_registers(ddata); if (error) - goto unprepare; + return error; error = sysc_init_sysc_mask(ddata); if (error) - goto unprepare; + return error; error = sysc_init_idlemodes(ddata); if (error) - goto unprepare; + return error; error = sysc_init_syss_mask(ddata); if (error) - goto unprepare; + return error; error = sysc_init_pdata(ddata); if (error) - goto unprepare; + return error; sysc_init_early_quirks(ddata); @@ -2413,7 +2413,7 @@ static int sysc_probe(struct platform_device *pdev) error = sysc_init_resets(ddata); if (error) - return error; + goto unprepare; error = sysc_init_module(ddata); if (error) |