lkml.org 
[lkml]   [2024]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v4 06/18] phy: ti: phy-j721e-wiz: use dev_err_probe() instead of dev_err()
    Use dev_err_probe() instead of dev_err() in wiz_clock_init() to simplify
    the code and standardize the error output.

    Signed-off-by: Thomas Richard <thomas.richard@bootlin.com>
    ---
    drivers/phy/ti/phy-j721e-wiz.c | 46 +++++++++++++++++++-----------------------
    1 file changed, 21 insertions(+), 25 deletions(-)

    diff --git a/drivers/phy/ti/phy-j721e-wiz.c b/drivers/phy/ti/phy-j721e-wiz.c
    index 00d7e6a6de03..5fea4df9404e 100644
    --- a/drivers/phy/ti/phy-j721e-wiz.c
    +++ b/drivers/phy/ti/phy-j721e-wiz.c
    @@ -1088,11 +1088,10 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
    int i;

    clk = devm_clk_get(dev, "core_ref_clk");
    - if (IS_ERR(clk)) {
    - dev_err(dev, "core_ref_clk clock not found\n");
    - ret = PTR_ERR(clk);
    - return ret;
    - }
    + if (IS_ERR(clk))
    + return dev_err_probe(dev, PTR_ERR(clk),
    + "core_ref_clk clock not found\n");
    +
    wiz->input_clks[WIZ_CORE_REFCLK] = clk;

    rate = clk_get_rate(clk);
    @@ -1122,11 +1121,10 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)

    if (wiz->data->pma_cmn_refclk1_int_mode) {
    clk = devm_clk_get(dev, "core_ref1_clk");
    - if (IS_ERR(clk)) {
    - dev_err(dev, "core_ref1_clk clock not found\n");
    - ret = PTR_ERR(clk);
    - return ret;
    - }
    + if (IS_ERR(clk))
    + return dev_err_probe(dev, PTR_ERR(clk),
    + "core_ref1_clk clock not found\n");
    +
    wiz->input_clks[WIZ_CORE_REFCLK1] = clk;

    rate = clk_get_rate(clk);
    @@ -1137,11 +1135,10 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
    }

    clk = devm_clk_get(dev, "ext_ref_clk");
    - if (IS_ERR(clk)) {
    - dev_err(dev, "ext_ref_clk clock not found\n");
    - ret = PTR_ERR(clk);
    - return ret;
    - }
    + if (IS_ERR(clk))
    + return dev_err_probe(dev, PTR_ERR(clk),
    + "ext_ref_clk clock not found\n");
    +
    wiz->input_clks[WIZ_EXT_REFCLK] = clk;

    rate = clk_get_rate(clk);
    @@ -1157,8 +1154,9 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
    case J721S2_WIZ_10G:
    ret = wiz_clock_register(wiz);
    if (ret)
    - dev_err(dev, "Failed to register wiz clocks\n");
    - return ret;
    + return dev_err_probe(dev, ret, "Failed to register wiz clocks\n");
    +
    + return 0;
    default:
    break;
    }
    @@ -1167,16 +1165,15 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
    node_name = clk_mux_sel[i].node_name;
    clk_node = of_get_child_by_name(node, node_name);
    if (!clk_node) {
    - dev_err(dev, "Unable to get %s node\n", node_name);
    - ret = -EINVAL;
    + ret = dev_err_probe(dev, -EINVAL, "Unable to get %s node\n", node_name);
    goto err;
    }

    ret = wiz_mux_of_clk_register(wiz, clk_node, wiz->mux_sel_field[i],
    clk_mux_sel[i].table);
    if (ret) {
    - dev_err(dev, "Failed to register %s clock\n",
    - node_name);
    + dev_err_probe(dev, ret, "Failed to register %s clock\n",
    + node_name);
    of_node_put(clk_node);
    goto err;
    }
    @@ -1188,16 +1185,15 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
    node_name = clk_div_sel[i].node_name;
    clk_node = of_get_child_by_name(node, node_name);
    if (!clk_node) {
    - dev_err(dev, "Unable to get %s node\n", node_name);
    - ret = -EINVAL;
    + ret = dev_err_probe(dev, -EINVAL, "Unable to get %s node\n", node_name);
    goto err;
    }

    ret = wiz_div_clk_register(wiz, clk_node, wiz->div_sel_field[i],
    clk_div_sel[i].table);
    if (ret) {
    - dev_err(dev, "Failed to register %s clock\n",
    - node_name);
    + dev_err_probe(dev, ret, "Failed to register %s clock\n",
    + node_name);
    of_node_put(clk_node);
    goto err;
    }
    --
    2.39.2


    \
     
     \ /
      Last update: 2024-05-27 15:34    [W:3.836 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site