[PATCH v2] phy: ti-pipe3: make clk operations symmetric in probe and remove

[PATCH v2] phy: ti-pipe3: make clk operations symmetric in probe and remove

[Chuhong Yuan]

The driver calls clk_prepare_enable in probe but the corresponding
clk_disable_unprepare() is in ti_pipe3_disable_clocks().
Move clk_disable_unprepare() to remove to make them symmetric.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
Changes in v2:
  - Modify commit message.
  - Delete the clk_disable_unprepare() in ti_pipe3_disable_clocks().

 drivers/phy/ti/phy-ti-pipe3.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/drivers/phy/ti/phy-ti-pipe3.c b/drivers/phy/ti/phy-ti-pipe3.c
index edd6859afba8..a87946589eb7 100644
--- a/drivers/phy/ti/phy-ti-pipe3.c
+++ b/drivers/phy/ti/phy-ti-pipe3.c
@@ -850,6 +850,12 @@ static int ti_pipe3_probe(struct platform_device *pdev)
 
 static int ti_pipe3_remove(struct platform_device *pdev)
 {
+	struct ti_pipe3 *phy = platform_get_drvdata(pdev);
+
+	if (phy->mode == PIPE3_MODE_SATA) {
+		clk_disable_unprepare(phy->refclk);
+		phy->sata_refclk_enabled = false;
+	}
 	pm_runtime_disable(&pdev->dev);
 
 	return 0;
@@ -900,18 +906,8 @@ static void ti_pipe3_disable_clocks(struct ti_pipe3 *phy)
 {
 	if (!IS_ERR(phy->wkupclk))
 		clk_disable_unprepare(phy->wkupclk);
-	if (!IS_ERR(phy->refclk)) {
+	if (!IS_ERR(phy->refclk))
 		clk_disable_unprepare(phy->refclk);
-		/*
-		 * SATA refclk needs an additional disable as we left it
-		 * on in probe to avoid Errata i783
-		 */
-		if (phy->sata_refclk_enabled) {
-			clk_disable_unprepare(phy->refclk);
-			phy->sata_refclk_enabled = false;
-		}
-	}
-
 	if (!IS_ERR(phy->div_clk))
 		clk_disable_unprepare(phy->div_clk);
 }
-- 
2.24.0

Re: [PATCH v2] phy: ti-pipe3: make clk operations symmetric in probe and remove

[Roger Quadros]

On 04/12/2019 13:47, Chuhong Yuan wrote:
> The driver calls clk_prepare_enable in probe but the corresponding
> clk_disable_unprepare() is in ti_pipe3_disable_clocks().
> Move clk_disable_unprepare() to remove to make them symmetric.
> 
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>

Acked-by: Roger Quadros <rogerq@ti.com>

> ---
> Changes in v2:
>    - Modify commit message.
>    - Delete the clk_disable_unprepare() in ti_pipe3_disable_clocks().
> 
>   drivers/phy/ti/phy-ti-pipe3.c | 18 +++++++-----------
>   1 file changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/phy/ti/phy-ti-pipe3.c b/drivers/phy/ti/phy-ti-pipe3.c
> index edd6859afba8..a87946589eb7 100644
> --- a/drivers/phy/ti/phy-ti-pipe3.c
> +++ b/drivers/phy/ti/phy-ti-pipe3.c
> @@ -850,6 +850,12 @@ static int ti_pipe3_probe(struct platform_device *pdev)
>   
>   static int ti_pipe3_remove(struct platform_device *pdev)
>   {
> +	struct ti_pipe3 *phy = platform_get_drvdata(pdev);
> +
> +	if (phy->mode == PIPE3_MODE_SATA) {
> +		clk_disable_unprepare(phy->refclk);
> +		phy->sata_refclk_enabled = false;
> +	}
>   	pm_runtime_disable(&pdev->dev);
>   
>   	return 0;
> @@ -900,18 +906,8 @@ static void ti_pipe3_disable_clocks(struct ti_pipe3 *phy)
>   {
>   	if (!IS_ERR(phy->wkupclk))
>   		clk_disable_unprepare(phy->wkupclk);
> -	if (!IS_ERR(phy->refclk)) {
> +	if (!IS_ERR(phy->refclk))
>   		clk_disable_unprepare(phy->refclk);
> -		/*
> -		 * SATA refclk needs an additional disable as we left it
> -		 * on in probe to avoid Errata i783
> -		 */
> -		if (phy->sata_refclk_enabled) {
> -			clk_disable_unprepare(phy->refclk);
> -			phy->sata_refclk_enabled = false;
> -		}
> -	}
> -
>   	if (!IS_ERR(phy->div_clk))
>   		clk_disable_unprepare(phy->div_clk);
>   }
> 

-- 
cheers,
-roger
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki