On Sat, Nov 09, 2024 at 10:28:38AM +0100, Lorenzo Bianconi wrote:
> Squash clk_bulk_prepare() and clk_bulk_enable() in
> clk_bulk_prepare_enable() in mtk_pcie_en7581_power_up() routine
>
Perhaps use something like,
"Replace clk_bulk_prepare() and clk_bulk_enable() with clk_bulk_prepare_enable()
in mtk_pcie_en7581_power_up()."
'Squash' doesn't sound right since you are not squashing any code.
> Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
> ---
> drivers/pci/controller/pcie-mediatek-gen3.c | 14 +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
> index 0fac0b9fd785e463d26d29d695b923db41eef9cc..8c8c733a145634cdbfefd339f4a692f25a6e24de 100644
> --- a/drivers/pci/controller/pcie-mediatek-gen3.c
> +++ b/drivers/pci/controller/pcie-mediatek-gen3.c
> @@ -903,12 +903,6 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
> pm_runtime_enable(dev);
> pm_runtime_get_sync(dev);
>
> - err = clk_bulk_prepare(pcie->num_clks, pcie->clks);
> - if (err) {
> - dev_err(dev, "failed to prepare clock\n");
> - goto err_clk_prepare;
> - }
> -
> val = FIELD_PREP(PCIE_VAL_LN0_DOWNSTREAM, 0x47) |
> FIELD_PREP(PCIE_VAL_LN1_DOWNSTREAM, 0x47) |
> FIELD_PREP(PCIE_VAL_LN0_UPSTREAM, 0x41) |
> @@ -921,17 +915,15 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
> FIELD_PREP(PCIE_K_FINETUNE_MAX, 0xf);
> writel_relaxed(val, pcie->base + PCIE_PIPE4_PIE8_REG);
>
> - err = clk_bulk_enable(pcie->num_clks, pcie->clks);
> + err = clk_bulk_prepare_enable(pcie->num_clks, pcie->clks);
> if (err) {
> dev_err(dev, "failed to prepare clock\n");
> - goto err_clk_enable;
> + goto err_clk_init;
err_clk_prepare_enable?
But I usually prefer err labels to be named after their purpose. Like here,
'err_runtime_put_reset' so it gives the reader a sense of what the label is
supposed to do.
However, to keep the existing sematics, you can just name it
err_clk_prepare_enable.
- Mani
> }
>
> return 0;
>
> -err_clk_enable:
> - clk_bulk_unprepare(pcie->num_clks, pcie->clks);
> -err_clk_prepare:
> +err_clk_init:
> pm_runtime_put_sync(dev);
> pm_runtime_disable(dev);
> reset_control_assert(pcie->mac_reset);
>
> --
> 2.47.0
>
--
மணிவண்ணன் சதாசிவம்
