Message ID | 20220208124034.414635-2-wenst@chromium.org (mailing list archive) |
---|---|
State | Mainlined, archived |
Headers | show |
Series | clk: mediatek: Cleanups and Improvements - Part 1 | expand |
On Tue, 2022-02-08 at 20:40 +0800, Chen-Yu Tsai wrote: > If %pe is used to print errors, a string representation of the error > would be printed instead of a number as with %ld. Also, all the sites > printing errors are deriving the error code from a pointer. Using %pe > is more straightforward. > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: Miles Chen <miles.chen@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > Reviewed-by: Chun-Jie Chen <chun-jie.chen@mediatek.com> > --- > drivers/clk/mediatek/clk-apmixed.c | 2 +- > drivers/clk/mediatek/clk-cpumux.c | 6 ++---- > drivers/clk/mediatek/clk-mtk.c | 18 ++++++------------ > drivers/clk/mediatek/clk-mux.c | 6 ++---- > drivers/clk/mediatek/clk-pll.c | 3 +-- > drivers/clk/mediatek/reset.c | 3 +-- > 6 files changed, 13 insertions(+), 25 deletions(-) > > diff --git a/drivers/clk/mediatek/clk-apmixed.c > b/drivers/clk/mediatek/clk-apmixed.c > index caa9119413f1..a29339cc26c4 100644 > --- a/drivers/clk/mediatek/clk-apmixed.c > +++ b/drivers/clk/mediatek/clk-apmixed.c > @@ -92,7 +92,7 @@ struct clk * __init > mtk_clk_register_ref2usb_tx(const char *name, > clk = clk_register(NULL, &tx->hw); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", name, > PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", name, clk); > kfree(tx); > } > > diff --git a/drivers/clk/mediatek/clk-cpumux.c > b/drivers/clk/mediatek/clk-cpumux.c > index e188018bc906..cab5095416b6 100644 > --- a/drivers/clk/mediatek/clk-cpumux.c > +++ b/drivers/clk/mediatek/clk-cpumux.c > @@ -87,8 +87,7 @@ int mtk_clk_register_cpumuxes(struct device_node > *node, > > regmap = device_node_to_regmap(node); > if (IS_ERR(regmap)) { > - pr_err("Cannot find regmap for %pOF: %ld\n", node, > - PTR_ERR(regmap)); > + pr_err("Cannot find regmap for %pOF: %pe\n", node, > regmap); > return PTR_ERR(regmap); > } > > @@ -97,8 +96,7 @@ int mtk_clk_register_cpumuxes(struct device_node > *node, > > clk = mtk_clk_register_cpumux(mux, regmap); > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", > - mux->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", mux- > >name, clk); > continue; > } > > diff --git a/drivers/clk/mediatek/clk-mtk.c > b/drivers/clk/mediatek/clk-mtk.c > index 8d5791b3f460..519a461cbb6f 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -70,8 +70,7 @@ void mtk_clk_register_fixed_clks(const struct > mtk_fixed_clk *clks, > rc->rate); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", > - rc->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", rc- > >name, clk); > continue; > } > > @@ -97,8 +96,7 @@ void mtk_clk_register_factors(const struct > mtk_fixed_factor *clks, > CLK_SET_RATE_PARENT, ff->mult, ff- > >div); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", > - ff->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", ff- > >name, clk); > continue; > } > > @@ -122,8 +120,7 @@ int mtk_clk_register_gates_with_dev(struct > device_node *node, > > regmap = device_node_to_regmap(node); > if (IS_ERR(regmap)) { > - pr_err("Cannot find regmap for %pOF: %ld\n", node, > - PTR_ERR(regmap)); > + pr_err("Cannot find regmap for %pOF: %pe\n", node, > regmap); > return PTR_ERR(regmap); > } > > @@ -141,8 +138,7 @@ int mtk_clk_register_gates_with_dev(struct > device_node *node, > gate->shift, gate->ops, gate->flags, > dev); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", > - gate->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", > gate->name, clk); > continue; > } > > @@ -264,8 +260,7 @@ void mtk_clk_register_composites(const struct > mtk_composite *mcs, > clk = mtk_clk_register_composite(mc, base, lock); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", > - mc->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", mc- > >name, clk); > continue; > } > > @@ -293,8 +288,7 @@ void mtk_clk_register_dividers(const struct > mtk_clk_divider *mcds, > mcd->div_width, mcd->clk_divider_flags, lock); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", > - mcd->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", mcd- > >name, clk); > continue; > } > > diff --git a/drivers/clk/mediatek/clk-mux.c > b/drivers/clk/mediatek/clk-mux.c > index 6d3a50eb7d6f..89f23e111d91 100644 > --- a/drivers/clk/mediatek/clk-mux.c > +++ b/drivers/clk/mediatek/clk-mux.c > @@ -175,8 +175,7 @@ int mtk_clk_register_muxes(const struct mtk_mux > *muxes, > > regmap = device_node_to_regmap(node); > if (IS_ERR(regmap)) { > - pr_err("Cannot find regmap for %pOF: %ld\n", node, > - PTR_ERR(regmap)); > + pr_err("Cannot find regmap for %pOF: %pe\n", node, > regmap); > return PTR_ERR(regmap); > } > > @@ -187,8 +186,7 @@ int mtk_clk_register_muxes(const struct mtk_mux > *muxes, > clk = mtk_clk_register_mux(mux, regmap, lock); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: > %ld\n", > - mux->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: > %pe\n", mux->name, clk); > continue; > } > > diff --git a/drivers/clk/mediatek/clk-pll.c > b/drivers/clk/mediatek/clk-pll.c > index 60d7ffa0b924..f04f724e12e5 100644 > --- a/drivers/clk/mediatek/clk-pll.c > +++ b/drivers/clk/mediatek/clk-pll.c > @@ -378,8 +378,7 @@ void mtk_clk_register_plls(struct device_node > *node, > clk = mtk_clk_register_pll(pll, base); > > if (IS_ERR(clk)) { > - pr_err("Failed to register clk %s: %ld\n", > - pll->name, PTR_ERR(clk)); > + pr_err("Failed to register clk %s: %pe\n", pll- > >name, clk); > continue; > } > > diff --git a/drivers/clk/mediatek/reset.c > b/drivers/clk/mediatek/reset.c > index ffe464ce7ff8..bcec4b89f449 100644 > --- a/drivers/clk/mediatek/reset.c > +++ b/drivers/clk/mediatek/reset.c > @@ -100,8 +100,7 @@ static void > mtk_register_reset_controller_common(struct device_node *np, > > regmap = device_node_to_regmap(np); > if (IS_ERR(regmap)) { > - pr_err("Cannot find regmap for %pOF: %ld\n", np, > - PTR_ERR(regmap)); > + pr_err("Cannot find regmap for %pOF: %pe\n", np, > regmap); > return; > } >
Quoting Chen-Yu Tsai (2022-02-08 04:40:04) > If %pe is used to print errors, a string representation of the error > would be printed instead of a number as with %ld. Also, all the sites > printing errors are deriving the error code from a pointer. Using %pe > is more straightforward. > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: Miles Chen <miles.chen@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- Applied to clk-next
diff --git a/drivers/clk/mediatek/clk-apmixed.c b/drivers/clk/mediatek/clk-apmixed.c index caa9119413f1..a29339cc26c4 100644 --- a/drivers/clk/mediatek/clk-apmixed.c +++ b/drivers/clk/mediatek/clk-apmixed.c @@ -92,7 +92,7 @@ struct clk * __init mtk_clk_register_ref2usb_tx(const char *name, clk = clk_register(NULL, &tx->hw); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", name, clk); kfree(tx); } diff --git a/drivers/clk/mediatek/clk-cpumux.c b/drivers/clk/mediatek/clk-cpumux.c index e188018bc906..cab5095416b6 100644 --- a/drivers/clk/mediatek/clk-cpumux.c +++ b/drivers/clk/mediatek/clk-cpumux.c @@ -87,8 +87,7 @@ int mtk_clk_register_cpumuxes(struct device_node *node, regmap = device_node_to_regmap(node); if (IS_ERR(regmap)) { - pr_err("Cannot find regmap for %pOF: %ld\n", node, - PTR_ERR(regmap)); + pr_err("Cannot find regmap for %pOF: %pe\n", node, regmap); return PTR_ERR(regmap); } @@ -97,8 +96,7 @@ int mtk_clk_register_cpumuxes(struct device_node *node, clk = mtk_clk_register_cpumux(mux, regmap); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - mux->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", mux->name, clk); continue; } diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 8d5791b3f460..519a461cbb6f 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -70,8 +70,7 @@ void mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, rc->rate); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - rc->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", rc->name, clk); continue; } @@ -97,8 +96,7 @@ void mtk_clk_register_factors(const struct mtk_fixed_factor *clks, CLK_SET_RATE_PARENT, ff->mult, ff->div); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - ff->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", ff->name, clk); continue; } @@ -122,8 +120,7 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, regmap = device_node_to_regmap(node); if (IS_ERR(regmap)) { - pr_err("Cannot find regmap for %pOF: %ld\n", node, - PTR_ERR(regmap)); + pr_err("Cannot find regmap for %pOF: %pe\n", node, regmap); return PTR_ERR(regmap); } @@ -141,8 +138,7 @@ int mtk_clk_register_gates_with_dev(struct device_node *node, gate->shift, gate->ops, gate->flags, dev); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - gate->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", gate->name, clk); continue; } @@ -264,8 +260,7 @@ void mtk_clk_register_composites(const struct mtk_composite *mcs, clk = mtk_clk_register_composite(mc, base, lock); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - mc->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", mc->name, clk); continue; } @@ -293,8 +288,7 @@ void mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, mcd->div_width, mcd->clk_divider_flags, lock); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - mcd->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", mcd->name, clk); continue; } diff --git a/drivers/clk/mediatek/clk-mux.c b/drivers/clk/mediatek/clk-mux.c index 6d3a50eb7d6f..89f23e111d91 100644 --- a/drivers/clk/mediatek/clk-mux.c +++ b/drivers/clk/mediatek/clk-mux.c @@ -175,8 +175,7 @@ int mtk_clk_register_muxes(const struct mtk_mux *muxes, regmap = device_node_to_regmap(node); if (IS_ERR(regmap)) { - pr_err("Cannot find regmap for %pOF: %ld\n", node, - PTR_ERR(regmap)); + pr_err("Cannot find regmap for %pOF: %pe\n", node, regmap); return PTR_ERR(regmap); } @@ -187,8 +186,7 @@ int mtk_clk_register_muxes(const struct mtk_mux *muxes, clk = mtk_clk_register_mux(mux, regmap, lock); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - mux->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", mux->name, clk); continue; } diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c index 60d7ffa0b924..f04f724e12e5 100644 --- a/drivers/clk/mediatek/clk-pll.c +++ b/drivers/clk/mediatek/clk-pll.c @@ -378,8 +378,7 @@ void mtk_clk_register_plls(struct device_node *node, clk = mtk_clk_register_pll(pll, base); if (IS_ERR(clk)) { - pr_err("Failed to register clk %s: %ld\n", - pll->name, PTR_ERR(clk)); + pr_err("Failed to register clk %s: %pe\n", pll->name, clk); continue; } diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c index ffe464ce7ff8..bcec4b89f449 100644 --- a/drivers/clk/mediatek/reset.c +++ b/drivers/clk/mediatek/reset.c @@ -100,8 +100,7 @@ static void mtk_register_reset_controller_common(struct device_node *np, regmap = device_node_to_regmap(np); if (IS_ERR(regmap)) { - pr_err("Cannot find regmap for %pOF: %ld\n", np, - PTR_ERR(regmap)); + pr_err("Cannot find regmap for %pOF: %pe\n", np, regmap); return; }