Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fceaa7d8 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: Prepare for clk registration API that uses DT nodes 



Split out the body of the clk_register() function so it can be shared
between the different types of registration APIs (DT, device).

Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Jeffrey Hugo <jhugo@codeaurora.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Rob Herring <robh@kernel.org>
Tested-by: default avatarJeffrey Hugo <jhugo@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent d1011cba

drivers/clk/clk.c

+18 −13
Original line number Diff line number Diff line
@@ -3313,18 +3313,7 @@ struct clk *clk_hw_create_clk(struct device *dev, struct clk_hw *hw, 
	return clk;

}



/**

 * clk_register - allocate a new clock, register it and return an opaque cookie

 * @dev: device that is registering this clock

 * @hw: link to hardware-specific clock data

 *

 * clk_register is the primary interface for populating the clock tree with new

 * clock nodes.  It returns a pointer to the newly allocated struct clk which

 * cannot be dereferenced by driver code but may be used in conjunction with the

 * rest of the clock API.  In the event of an error clk_register will return an

 * error code; drivers must test for an error code after calling clk_register.

 */

struct clk *clk_register(struct device *dev, struct clk_hw *hw)

static struct clk *__clk_register(struct device *dev, struct clk_hw *hw)

{

	int i, ret;

	struct clk_core *core;
@@ -3426,6 +3415,22 @@ struct clk *clk_register(struct device *dev, struct clk_hw *hw) 
fail_out:

	return ERR_PTR(ret);

}



/**

 * clk_register - allocate a new clock, register it and return an opaque cookie

 * @dev: device that is registering this clock

 * @hw: link to hardware-specific clock data

 *

 * clk_register is the primary interface for populating the clock tree with new

 * clock nodes.  It returns a pointer to the newly allocated struct clk which

 * cannot be dereferenced by driver code but may be used in conjunction with the

 * rest of the clock API.  In the event of an error clk_register will return an

 * error code; drivers must test for an error code after calling clk_register.

 */

struct clk *clk_register(struct device *dev, struct clk_hw *hw)

{

	return __clk_register(dev, hw);

}

EXPORT_SYMBOL_GPL(clk_register);



/**
@@ -3440,7 +3445,7 @@ EXPORT_SYMBOL_GPL(clk_register); 
 */

int clk_hw_register(struct device *dev, struct clk_hw *hw)

{

	return PTR_ERR_OR_ZERO(clk_register(dev, hw));

	return PTR_ERR_OR_ZERO(__clk_register(dev, hw));

}

EXPORT_SYMBOL_GPL(clk_hw_register);