From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 247871BD9DB for ; Fri, 8 Nov 2024 16:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731083507; cv=none; b=NeUH2ikmTdPfdw2nWtnDkugk/yb0AiLBsg5DdLhAB8L7YIOle7xmf+J7eDJ0CgkVMyIgsc6G4zlogHovsGJ6xKVI6DPUVWj9teUrNNxrZNwowOMvJjxq4w1WgnDQTHCCq3H5TWwNG8uy8wYObojolF8ERxv5JpyshpHFRJAx7DE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731083507; c=relaxed/simple; bh=y2tphCg/4UIElvam6OTF1ypc+EZQH3jmGHkO7T9z/Ro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AvC0G20V8OyhNxoMxYfzAvqjiz+GKRPXkMW03XvmOLDn32yj+CkHKb3jM6V5TJK1j4peOoZIFgmZ653XPDzer+p+ISEpbDq2DsByAbIR+5+TxLSSrLyLSgKgOQrvs6XLbETwzl8KS7Cp8tXwVsBh1H7sepzJxnftpMsO3bzUe1Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=a93gCj5E; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="a93gCj5E" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Type:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=izN+X3JybrKK3iW3oQFoGwC3TrXxDusclG/MM8ky+oc=; b=a93gCj5EQaa5WFfrWF+Gdcnm5F uw8saVwmq4piDb+9MXm+v9IJ2WY8MB5TGAGH+e2H1FhIMlDdLr8OG/ZZlSYxQV/hnIJ/zYaFL3JOd IS39aRFipWyrpa4UcbHBDS4F4U/Sm9QvXtqh/1PxxjUQXkcEg2pNU14Al929Z+bwRMiwvNJAqXWKA 8uzIdw9bBva4uujwZkKW4f4dGxcR5DOYy5sRxrxWSFXvIXpi8m2c5tkbJbbm+7X3eg8CHcAmAyTFM 17SsXfveEXhvgDWW0ZFVrOw73ztGmjXzoa6kVCbkikg3wWktlN/5PLO1nKmPPFDvapn5IDzq2mGHa vTV0iBlQ==; Received: from i53875b28.versanet.de ([83.135.91.40] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1t9RtO-0007OO-3f; Fri, 08 Nov 2024 17:31:26 +0100 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, Diederik de Haas Cc: dsimic@manjaro.org, andy.yan@rock-chips.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, linux-kernel@vger.kernel.org, Heiko Stuebner Subject: Re: [PATCH] drm/rockchip: dsi: convert to dev_err_probe in probe function Date: Fri, 08 Nov 2024 17:31:25 +0100 Message-ID: <3594835.iIbC2pHGDl@diego> In-Reply-To: References: <20241108144425.1009916-1-heiko@sntech.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Am Freitag, 8. November 2024, 16:21:24 CET schrieb Diederik de Haas: > On Fri Nov 8, 2024 at 3:44 PM CET, Heiko Stuebner wrote: > > From: Heiko Stuebner > > > > 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 > > Should this have a Fixes tag? > Because in the PineTab2 case it reported an error, which was actually > just a deferred probe. A deferred-probe is an error ;-) -517 in fact ... just that convention nowadays is to not actively report on it but "fail" silently. So personally I don't really consider it a fix, but more a style thing. I guess I'll let others chime in for that. Heiko > > > --- > > .../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; > > ... > >