From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-4316.protonmail.ch (mail-4316.protonmail.ch [185.70.43.16]) (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 A4E1717BEA5; Mon, 26 Aug 2024 12:38:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.43.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724675908; cv=none; b=tqmQPCfqk8aAQ+SSXY59k+RJpOAPzUseSKxSpsGhpm2Z4Ra7rMReTYrEPeaK1/9kzwN0292ljhctRauszOs7UezqzBmxSRek+6mILeM5sN5X2vYbNzw+4eRXRB5GYvHwzSplBVD90sIq08PSsUVcQOs6CKKIh+OySrLz73XLULw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724675908; c=relaxed/simple; bh=7PIXhv7l5NwDu8aIH1um6fUTdp9QndNFB1avfLBoH8s=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=a7In8lU5/MWi+pD8rirkRa2oo/+MZiTFVERm32EHyagolAOrcWgbIbpbxISC3/POw6d/f62gD0QKSsdsACBD63kTGE6ixNIgrP5gD90Q//rsISJqxa93KA+lrhWt/PMSTOd1trbwiRT/cgmbGSEgWJVI3ZLRjWhQQqhOhbHRY9E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=protonmail.com; spf=pass smtp.mailfrom=protonmail.com; dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com header.b=qupk6xsL; arc=none smtp.client-ip=185.70.43.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=protonmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=protonmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com header.b="qupk6xsL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1724675904; x=1724935104; bh=BGalRL9o6f637EmyVXtZVrUv2eCLH5tTBp+42n6pyxY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=qupk6xsLjbRB/bbyGK3M8jvelTHh+awrO+swmDKvfHUynSPUjnemkCJggYxd1XC4R nQUbPtlpO1YVuC/R++0Q5RJxaiK+BQEcOOsHFAuebBYVQ1TnXxpSQOLbLQlJoc5N4+ QAx0ui/bdqSmAgmkFfHUJDNL1Vwt7ej0+CiBAWZXW8L/6nweGcfMgorjcvbbW1snDr uAb3kWKFif1aL8B8V3r4xYcueBju5XOw5AdOHpNhTJQZ+JDN+hIMu60chMAEArTcZf SIQjcCmNcJclzkyVYpff+KCDuDsq76F20+epo8/Ndz2VVFxE8A1kYqFtCsFPyKNTpi I8U2sX4/fPA6g== Date: Mon, 26 Aug 2024 12:38:18 +0000 To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michal Simek , Greg Kroah-Hartman From: Harry Austen Cc: Shubhrajyoti Datta , Dave Ertman , Ira Weiny , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Harry Austen Subject: [PATCH v3 3/9] clk: clocking-wizard: use devres versions of clk_hw API Message-ID: <20240826123602.1872-4-hpausten@protonmail.com> In-Reply-To: <20240826123602.1872-1-hpausten@protonmail.com> References: <20240826123602.1872-1-hpausten@protonmail.com> Feedback-ID: 53116287:user:proton X-Pm-Message-ID: c9cf9339f11a6660db3ccb817d904ebfc687e1aa Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Use device managed versions of the clk_hw API, entirely removing the need for the driver's remove() callback and greatly simplifying the probe() function's error paths. Signed-off-by: Harry Austen --- drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 52 +++++----------------- 1 file changed, 11 insertions(+), 41 deletions(-) diff --git a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c b/drivers/clk/xilin= x/clk-xlnx-clock-wizard.c index cd795a4952099..f332e0eee56c8 100644 --- a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c +++ b/drivers/clk/xilinx/clk-xlnx-clock-wizard.c @@ -1082,7 +1082,7 @@ static int clk_wzrd_probe(struct platform_device *pde= v) =09clk_name =3D devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_mul", dev_name(= &pdev->dev)); =09if (!clk_name) =09=09return -ENOMEM; -=09clk_wzrd->clks_internal[wzrd_clk_mul] =3D clk_hw_register_fixed_factor +=09clk_wzrd->clks_internal[wzrd_clk_mul] =3D devm_clk_hw_register_fixed_fa= ctor =09=09=09(&pdev->dev, clk_name, =09=09=09 __clk_get_name(clk_wzrd->clk_in1), =09=09=090, mult, div); @@ -1092,10 +1092,8 @@ static int clk_wzrd_probe(struct platform_device *pd= ev) =09} =20 =09clk_name =3D devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_mul_div", dev_n= ame(&pdev->dev)); -=09if (!clk_name) { -=09=09ret =3D -ENOMEM; -=09=09goto err_rm_int_clk; -=09} +=09if (!clk_name) +=09=09return -ENOMEM; =20 =09if (is_versal) { =09=09edged =3D !!(readl(clk_wzrd->base + WZRD_CLK_CFG_REG(is_versal, 20))= & @@ -1110,11 +1108,11 @@ static int clk_wzrd_probe(struct platform_device *p= dev) =20 =09=09clk_mul_name =3D clk_hw_get_name(clk_wzrd->clks_internal[wzrd_clk_mu= l]); =09=09clk_wzrd->clks_internal[wzrd_clk_mul_div] =3D -=09=09=09clk_hw_register_fixed_factor(&pdev->dev, clk_name, -=09=09=09=09=09=09 clk_mul_name, 0, 1, div); +=09=09=09devm_clk_hw_register_fixed_factor(&pdev->dev, clk_name, +=09=09=09=09=09=09=09 clk_mul_name, 0, 1, div); =09} else { =09=09ctrl_reg =3D clk_wzrd->base + WZRD_CLK_CFG_REG(is_versal, 0); -=09=09clk_wzrd->clks_internal[wzrd_clk_mul_div] =3D clk_hw_register_divide= r +=09=09clk_wzrd->clks_internal[wzrd_clk_mul_div] =3D devm_clk_hw_register_d= ivider =09=09=09(&pdev->dev, clk_name, =09=09=09 clk_hw_get_name(clk_wzrd->clks_internal[wzrd_clk_mul]), =09=09=09flags, ctrl_reg, 0, 8, CLK_DIVIDER_ONE_BASED | @@ -1122,18 +1120,15 @@ static int clk_wzrd_probe(struct platform_device *p= dev) =09} =09if (IS_ERR(clk_wzrd->clks_internal[wzrd_clk_mul_div])) { =09=09dev_err(&pdev->dev, "unable to register divider clock\n"); -=09=09ret =3D PTR_ERR(clk_wzrd->clks_internal[wzrd_clk_mul_div]); -=09=09goto err_rm_int_clk; +=09=09return PTR_ERR(clk_wzrd->clks_internal[wzrd_clk_mul_div]); =09} =20 =09/* register div per output */ =09for (i =3D nr_outputs - 1; i >=3D 0 ; i--) { =09=09clkout_name =3D devm_kasprintf(&pdev->dev, GFP_KERNEL, =09=09=09=09=09 "%s_out%d", dev_name(&pdev->dev), i); -=09=09if (!clkout_name) { -=09=09=09ret =3D -ENOMEM; -=09=09=09goto err_rm_int_clk; -=09=09} +=09=09if (!clkout_name) +=09=09=09return -ENOMEM; =20 =09=09if (is_versal) { =09=09=09clk_wzrd->clk_data.hws[i] =3D clk_wzrd_ver_register_divider @@ -1165,20 +1160,15 @@ static int clk_wzrd_probe(struct platform_device *p= dev) =09=09=09=09=09DIV_O, &clkwzrd_lock); =09=09} =09=09if (IS_ERR(clk_wzrd->clk_data.hws[i])) { -=09=09=09int j; - -=09=09=09for (j =3D i + 1; j < nr_outputs; j++) -=09=09=09=09clk_hw_unregister(clk_wzrd->clk_data.hws[j]); =09=09=09dev_err(&pdev->dev, =09=09=09=09"unable to register divider clock\n"); -=09=09=09ret =3D PTR_ERR(clk_wzrd->clk_data.hws[i]); -=09=09=09goto err_rm_int_clks; +=09=09=09return PTR_ERR(clk_wzrd->clk_data.hws[i]); =09=09} =09} =20 out: =09clk_wzrd->clk_data.num =3D nr_outputs; -=09ret =3D of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get= , &clk_wzrd->clk_data); +=09ret =3D devm_of_clk_add_hw_provider(&pdev->dev, of_clk_hw_onecell_get, = &clk_wzrd->clk_data); =09if (ret) { =09=09dev_err(&pdev->dev, "unable to register clock provider\n"); =09=09return ret; @@ -1201,25 +1191,6 @@ static int clk_wzrd_probe(struct platform_device *pd= ev) =09} =20 =09return 0; - -err_rm_int_clks: -=09clk_hw_unregister(clk_wzrd->clks_internal[1]); -err_rm_int_clk: -=09clk_hw_unregister(clk_wzrd->clks_internal[0]); -=09return ret; -} - -static void clk_wzrd_remove(struct platform_device *pdev) -{ -=09int i; -=09struct clk_wzrd *clk_wzrd =3D platform_get_drvdata(pdev); - -=09of_clk_del_provider(pdev->dev.of_node); - -=09for (i =3D 0; i < WZRD_NUM_OUTPUTS; i++) -=09=09clk_hw_unregister(clk_wzrd->clk_data.hws[i]); -=09for (i =3D 0; i < wzrd_clk_int_max; i++) -=09=09clk_hw_unregister(clk_wzrd->clks_internal[i]); } =20 static const struct of_device_id clk_wzrd_ids[] =3D { @@ -1238,7 +1209,6 @@ static struct platform_driver clk_wzrd_driver =3D { =09=09.pm =3D &clk_wzrd_dev_pm_ops, =09}, =09.probe =3D clk_wzrd_probe, -=09.remove_new =3D clk_wzrd_remove, }; module_platform_driver(clk_wzrd_driver); =20 --=20 2.46.0