From bd0e79f1da3cc5da586c92144fbab9fd24700735 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 31 Jul 2019 12:35:16 -0700 Subject: phy: ti: am654-serdes: Don't reference clk_init_data after registration A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions. Cc: Roger Quadros Cc: Kishon Vijay Abraham I Signed-off-by: Stephen Boyd Link: https://lkml.kernel.org/r/20190731193517.237136-9-sboyd@kernel.org Acked-by: Kishon Vijay Abraham I --- drivers/phy/ti/phy-am654-serdes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/phy') diff --git a/drivers/phy/ti/phy-am654-serdes.c b/drivers/phy/ti/phy-am654-serdes.c index f8edd0840fa2..398a8c9b675a 100644 --- a/drivers/phy/ti/phy-am654-serdes.c +++ b/drivers/phy/ti/phy-am654-serdes.c @@ -335,6 +335,7 @@ static int serdes_am654_clk_mux_set_parent(struct clk_hw *hw, u8 index) { struct serdes_am654_clk_mux *mux = to_serdes_am654_clk_mux(hw); struct regmap *regmap = mux->regmap; + const char *name = clk_hw_get_name(hw); unsigned int reg = mux->reg; int clk_id = mux->clk_id; int parents[SERDES_NUM_CLOCKS]; @@ -374,8 +375,7 @@ static int serdes_am654_clk_mux_set_parent(struct clk_hw *hw, u8 index) * This can never happen, unless we missed * a valid combination in serdes_am654_mux_table. */ - WARN(1, "Failed to find the parent of %s clock\n", - hw->init->name); + WARN(1, "Failed to find the parent of %s clock\n", name); return -EINVAL; } -- cgit v1.2.3