On Fri Nov 8, 2024 at 3:44 PM CET, Heiko Stuebner wrote:
> From: Heiko Stuebner <heiko.stuebner@xxxxxxxxx>
>
> DRM_DEV_ERROR is deprecated and using dev_err_probe saves quite a number
> of lines too, so convert the error prints for the dsi-driver.
>
> Signed-off-by: Heiko Stuebner <heiko.stuebner@xxxxxxxxx>
Should this have a Fixes tag?
Because in the PineTab2 case it reported an error, which was actually
just a deferred probe.
> ---
> .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 80 ++++++-------------
> 1 file changed, 26 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
> index 58a44af0e9ad..3224ab749352 100644
> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
> ...
> @@ -1378,67 +1376,47 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
> i++;
> }
>
> - if (!dsi->cdata) {
> - DRM_DEV_ERROR(dev, "no dsi-config for %s node\n", np->name);
> - return -EINVAL;
> - }
> + if (!dsi->cdata)
> + return dev_err_probe(dev, -EINVAL, "No dsi-config for %s node\n", np->name);
>
> /* try to get a possible external dphy */
> dsi->phy = devm_phy_optional_get(dev, "dphy");
> - if (IS_ERR(dsi->phy)) {
> - ret = PTR_ERR(dsi->phy);
> - DRM_DEV_ERROR(dev, "failed to get mipi dphy: %d\n", ret);
> - return ret;
> - }
> + if (IS_ERR(dsi->phy))
> + return dev_err_probe(dev, PTR_ERR(dsi->phy), "Failed to get mipi dphy\n");
I think from this line.
Cheers,
Diederik
>
> dsi->pclk = devm_clk_get(dev, "pclk");
> - if (IS_ERR(dsi->pclk)) {
> - ret = PTR_ERR(dsi->pclk);
> - DRM_DEV_ERROR(dev, "Unable to get pclk: %d\n", ret);
> - return ret;
> - }
> + if (IS_ERR(dsi->pclk))
> + return dev_err_probe(dev, PTR_ERR(dsi->pclk), "Unable to get pclk\n");
>
> dsi->pllref_clk = devm_clk_get(dev, "ref");
> if (IS_ERR(dsi->pllref_clk)) {
> - if (dsi->phy) {
> + if (dsi->phy)
> /*
> * if external phy is present, pll will be
> * generated there.
> */
> dsi->pllref_clk = NULL;
> - } else {
> - ret = PTR_ERR(dsi->pllref_clk);
> - DRM_DEV_ERROR(dev,
> - "Unable to get pll reference clock: %d\n",
> - ret);
> - return ret;
> - }
> + else
> + return dev_err_probe(dev, PTR_ERR(dsi->pllref_clk),
> + "Unable to get pll reference clock\n");
> }
>
> if (dsi->cdata->flags & DW_MIPI_NEEDS_PHY_CFG_CLK) {
> dsi->phy_cfg_clk = devm_clk_get(dev, "phy_cfg");
> - if (IS_ERR(dsi->phy_cfg_clk)) {
> - ret = PTR_ERR(dsi->phy_cfg_clk);
> - DRM_DEV_ERROR(dev,
> - "Unable to get phy_cfg_clk: %d\n", ret);
> - return ret;
> - }
> + if (IS_ERR(dsi->phy_cfg_clk))
> + return dev_err_probe(dev, PTR_ERR(dsi->phy_cfg_clk),
> + "Unable to get phy_cfg_clk\n");
> }
>
> if (dsi->cdata->flags & DW_MIPI_NEEDS_GRF_CLK) {
> dsi->grf_clk = devm_clk_get(dev, "grf");
> - if (IS_ERR(dsi->grf_clk)) {
> - ret = PTR_ERR(dsi->grf_clk);
> - DRM_DEV_ERROR(dev, "Unable to get grf_clk: %d\n", ret);
> - return ret;
> - }
> + if (IS_ERR(dsi->grf_clk))
> + return dev_err_probe(dev, PTR_ERR(dsi->grf_clk), "Unable to get grf_clk\n");
> }
>
> dsi->grf_regmap = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
> - if (IS_ERR(dsi->grf_regmap)) {
> - DRM_DEV_ERROR(dev, "Unable to get rockchip,grf\n");
> - return PTR_ERR(dsi->grf_regmap);
> - }
> + if (IS_ERR(dsi->grf_regmap))
> + return dev_err_probe(dev, PTR_ERR(dsi->grf_regmap), "Unable to get rockchip,grf\n");
>
> dsi->dev = dev;
> dsi->pdata.base = dsi->base;
> ...
Attachment:
signature.asc
Description: PGP signature
