AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: 8631/1: clkdev: Detect errors in clk_hw_register_clkdev() for mass registration

Browse Source 
Unlike clk_register_clkdev(), clk_hw_register_clkdev() doesn't check for
passed error objects from a previous registration call. Hence the caller
of clk_hw_register_*() has to check for errors before calling
clk_hw_register_clkdev*().

Make clk_hw_register_clkdev() more similar to clk_register_clkdev() by
adding this error check, removing the burden from callers that do mass
registration.

Fixes: e4f1b49bda ("clkdev: Add clk_hw based registration APIs")
Fixes: 944b9a41e0 ("clk: ls1x: Migrate to clk_hw based OF and registration APIs")
Fixes: 44ce9a9ae9 ("MIPS: TXx9: Convert to Common Clock Framework")
Fixes: f48d947a16 ("clk: clps711x: Migrate to clk_hw based OF and registration APIs")
Fixes: b4626a7f48 ("CLK: Add Loongson1C clock support")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Geert Uytterhoeven 2016-11-22 12:33:11 +01:00 committed by Russell King
parent 1001354ca3
commit 9388093db4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clk/clkdev.c
View File

@ -448,12 +448,20 @@ EXPORT_SYMBOL(clk_register_clkdev);
* *
* con_id or dev_id may be NULL as a wildcard, just as in the rest of * con_id or dev_id may be NULL as a wildcard, just as in the rest of
* clkdev. * clkdev.
*
* To make things easier for mass registration, we detect error clk_hws
* from a previous clk_hw_register_*() call, and return the error code for
* those. This is to permit this function to be called immediately
* after clk_hw_register_*().
*/ */
int clk_hw_register_clkdev(struct clk_hw *hw, const char *con_id, int clk_hw_register_clkdev(struct clk_hw *hw, const char *con_id,
const char *dev_id) const char *dev_id)
{ {
struct clk_lookup *cl; struct clk_lookup *cl;
if (IS_ERR(hw))
return PTR_ERR(hw);
/* /*
* Since dev_id can be NULL, and NULL is handled specially, we must * Since dev_id can be NULL, and NULL is handled specially, we must
* pass it as either a NULL format string, or with "%s". * pass it as either a NULL format string, or with "%s".