This normalizes the name of this accessor function to put "_optional" last.
Signed-off-by: Sean Anderson <[email protected]> --- drivers/clk/clk-uclass.c | 3 ++- drivers/phy/phy-mtk-tphy.c | 8 ++++---- include/clk.h | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 493018b33e..18699d69e3 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -432,7 +432,8 @@ int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk) return clk_get_by_index_nodev(node, index, clk); } -int clk_get_optional_nodev(ofnode node, const char *name, struct clk *clk) +int clk_get_by_name_nodev_optional(ofnode node, const char *name, + struct clk *clk) { int ret; diff --git a/drivers/phy/phy-mtk-tphy.c b/drivers/phy/phy-mtk-tphy.c index 824244b852..2dd964f7b2 100644 --- a/drivers/phy/phy-mtk-tphy.c +++ b/drivers/phy/phy-mtk-tphy.c @@ -723,13 +723,13 @@ static int mtk_tphy_probe(struct udevice *dev) tphy->phys[index] = instance; index++; - err = clk_get_optional_nodev(subnode, "ref", - &instance->ref_clk); + err = clk_get_by_name_nodev_optional(subnode, "ref", + &instance->ref_clk); if (err) return err; - err = clk_get_optional_nodev(subnode, "da_ref", - &instance->da_ref_clk); + err = clk_get_by_name_nodev_optional(subnode, "da_ref", + &instance->da_ref_clk); if (err) return err; } diff --git a/include/clk.h b/include/clk.h index a928879b12..943c87f3c3 100644 --- a/include/clk.h +++ b/include/clk.h @@ -194,7 +194,7 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk); int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk); /** - * clk_get_optional_nodev - Get/request an optinonal clock by name + * clk_get_by_name_nodev_optional - Get/request an optinonal clock by name * without a device. * @node: The client ofnode. * @name: The name of the clock to request. @@ -206,7 +206,8 @@ int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk); * no clock producer, in this case, skip the error number -ENODATA, and * the function returns 0. */ -int clk_get_optional_nodev(ofnode node, const char *name, struct clk *clk); +int clk_get_by_name_nodev_optional(ofnode node, const char *name, + struct clk *clk); /** * devm_clk_get - lookup and obtain a managed reference to a clock producer. @@ -291,7 +292,7 @@ clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk) } static inline int -clk_get_optional_nodev(ofnode node, const char *name, struct clk *clk) +clk_get_by_name_nodev_optional(ofnode node, const char *name, struct clk *clk) { return -ENOSYS; } -- 2.33.0
