Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Tue, 12 Apr 2022 15:23:25 +0200
From:   Maxime Ripard <maxime@cerno.tech>
To:     Samuel Holland <samuel@sholland.org>
Cc:     Chen-Yu Tsai <wens@csie.org>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        David Airlie <airlied@linux.ie>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        dri-devel@lists.freedesktop.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        linux-sunxi@lists.linux.dev
Subject: Re: [PATCH 3/6] drm/sun4i: sun8i-hdmi-phy: Used device-managed
 clocks/resets
Message-ID: <20220412132325.bq2c3g2fskckfgpz@houat>
References: <20220412043512.49364-1-samuel@sholland.org>
 <20220412043512.49364-4-samuel@sholland.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="542vfuzlbowtb4mg"
Content-Disposition: inline
In-Reply-To: <20220412043512.49364-4-samuel@sholland.org>
Precedence: bulk


--542vfuzlbowtb4mg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Mon, Apr 11, 2022 at 11:35:08PM -0500, Samuel Holland wrote:
> Now that the HDMI PHY is using a platform driver, it can use device-
> managed resources. Use these, as well as the dev_err_probe helper, to
> simplify the probe function and get rid of the remove function.
>=20
> Signed-off-by: Samuel Holland <samuel@sholland.org>
> ---
>=20
>  drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 100 ++++++++-----------------
>  1 file changed, 30 insertions(+), 70 deletions(-)
>=20
> diff --git a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c b/drivers/gpu/drm/sun=
4i/sun8i_hdmi_phy.c
> index 1effa30bfe62..1351e633d485 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
> +++ b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
> @@ -673,10 +673,8 @@ int sun8i_hdmi_phy_get(struct sun8i_dw_hdmi *hdmi, s=
truct device_node *node)
>  static int sun8i_hdmi_phy_probe(struct platform_device *pdev)
>  {
>  	struct device *dev =3D &pdev->dev;
> -	struct device_node *node =3D dev->of_node;
>  	struct sun8i_hdmi_phy *phy;
>  	void __iomem *regs;
> -	int ret;
> =20
>  	phy =3D devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);
>  	if (!phy)
> @@ -686,88 +684,50 @@ static int sun8i_hdmi_phy_probe(struct platform_dev=
ice *pdev)
>  	phy->dev =3D dev;
> =20
>  	regs =3D devm_platform_ioremap_resource(pdev, 0);
> -	if (IS_ERR(regs)) {
> -		dev_err(dev, "Couldn't map the HDMI PHY registers\n");
> -		return PTR_ERR(regs);
> -	}
> +	if (IS_ERR(regs))
> +		return dev_err_probe(dev, PTR_ERR(regs),
> +				     "Couldn't map the HDMI PHY registers\n");
> =20
>  	phy->regs =3D devm_regmap_init_mmio(dev, regs,
>  					  &sun8i_hdmi_phy_regmap_config);
> -	if (IS_ERR(phy->regs)) {
> -		dev_err(dev, "Couldn't create the HDMI PHY regmap\n");
> -		return PTR_ERR(phy->regs);
> -	}
> +	if (IS_ERR(phy->regs))
> +		return dev_err_probe(dev, PTR_ERR(phy->regs),
> +				     "Couldn't create the HDMI PHY regmap\n");
> =20
> -	phy->clk_bus =3D of_clk_get_by_name(node, "bus");
> -	if (IS_ERR(phy->clk_bus)) {
> -		dev_err(dev, "Could not get bus clock\n");
> -		return PTR_ERR(phy->clk_bus);
> -	}
> -
> -	phy->clk_mod =3D of_clk_get_by_name(node, "mod");
> -	if (IS_ERR(phy->clk_mod)) {
> -		dev_err(dev, "Could not get mod clock\n");
> -		ret =3D PTR_ERR(phy->clk_mod);
> -		goto err_put_clk_bus;
> -	}
> +	phy->clk_bus =3D devm_clk_get(dev, "bus");
> +	if (IS_ERR(phy->clk_bus))
> +		return dev_err_probe(dev, PTR_ERR(phy->clk_bus),
> +				     "Could not get bus clock\n");
> =20
> -	if (phy->variant->has_phy_clk) {
> -		phy->clk_pll0 =3D of_clk_get_by_name(node, "pll-0");
> -		if (IS_ERR(phy->clk_pll0)) {
> -			dev_err(dev, "Could not get pll-0 clock\n");
> -			ret =3D PTR_ERR(phy->clk_pll0);
> -			goto err_put_clk_mod;
> -		}
> -
> -		if (phy->variant->has_second_pll) {
> -			phy->clk_pll1 =3D of_clk_get_by_name(node, "pll-1");
> -			if (IS_ERR(phy->clk_pll1)) {
> -				dev_err(dev, "Could not get pll-1 clock\n");
> -				ret =3D PTR_ERR(phy->clk_pll1);
> -				goto err_put_clk_pll0;
> -			}
> -		}
> -	}
> +	phy->clk_mod =3D devm_clk_get(dev, "mod");
> +	if (IS_ERR(phy->clk_mod))
> +		return dev_err_probe(dev, PTR_ERR(phy->clk_mod),
> +				     "Could not get mod clock\n");
> =20
> -	phy->rst_phy =3D of_reset_control_get_shared(node, "phy");
> -	if (IS_ERR(phy->rst_phy)) {
> -		dev_err(dev, "Could not get phy reset control\n");
> -		ret =3D PTR_ERR(phy->rst_phy);
> -		goto err_put_clk_pll1;
> -	}
> +	if (phy->variant->has_phy_clk)
> +		phy->clk_pll0 =3D devm_clk_get(dev, "pll-0");
> +	if (IS_ERR(phy->clk_pll0))
> +		return dev_err_probe(dev, PTR_ERR(phy->clk_pll0),
> +				     "Could not get pll-0 clock\n");
> +
> +	if (phy->variant->has_second_pll)
> +		phy->clk_pll1 =3D devm_clk_get(dev, "pll-1");
> +	if (IS_ERR(phy->clk_pll1))
> +		return dev_err_probe(dev, PTR_ERR(phy->clk_pll1),
> +				     "Could not get pll-1 clock\n");
> +
> +	phy->rst_phy =3D devm_reset_control_get_shared(dev, "phy");
> +	if (IS_ERR(phy->rst_phy))
> +		return dev_err_probe(dev, PTR_ERR(phy->rst_phy),
> +				     "Could not get phy reset control\n");

I find the old construct clearer with the imbricated blocks.

Otherwise, the rest of the series looks fine, thanks!
Maxime

--542vfuzlbowtb4mg
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYlV9TQAKCRDj7w1vZxhR
xXz3AQCLd+iM9nW9TMjH67uErKUxeCFePEosuu47NlHJp2MjHQD/dC1dKOtp1lTu
FRHk3m7R4Cr2sMERznd+wOMkOdpzjQk=
=f6v7
-----END PGP SIGNATURE-----

--542vfuzlbowtb4mg--