diff mbox series

[02/18] clk: qcom: reset: Commonize the de/assert functions

Message ID	20240105-topic-venus_reset-v1-2-981c7a624855@linaro.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-19524-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; From: Konrad Dybcio <konrad.dybcio@linaro.org> Date: Mon, 08 Jan 2024 13:32:19 +0100 Subject: [PATCH 02/18] clk: qcom: reset: Commonize the de/assert functions Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240105-topic-venus_reset-v1-2-981c7a624855@linaro.org> References: <20240105-topic-venus_reset-v1-0-981c7a624855@linaro.org> In-Reply-To: <20240105-topic-venus_reset-v1-0-981c7a624855@linaro.org> To: Bjorn Andersson <andersson@kernel.org>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Philipp Zabel <p.zabel@pengutronix.de> Cc: Marijn Suijten <marijn.suijten@somainline.org>, linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue <bryan.odonoghue@linaro.org>, Dikshita Agarwal <quic_dikshita@quicinc.com>, Vikash Garodia <quic_vgarodia@quicinc.com>, Konrad Dybcio <konrad.dybcio@linaro.org>, Manivannan Sadhasivam <mani@kernel.org>
Series	Qualcomm GCC/VIDEOCC reset overhaul for Venus \| [00/18] Qualcomm GCC/VIDEOCC reset overhaul for Venus [01/18] clk: qcom: reset: Increase max reset delay [02/18] clk: qcom: reset: Commonize the de/assert functions [03/18] clk: qcom: reset: Ensure write completion on reset de/assertion [04/18] clk: qcom: gcc-sa8775p: Set delay for Venus CLK resets [05/18] clk: qcom: gcc-sc8180x: Set delay for Venus CLK resets [06/18] clk: qcom: gcc-sc8280xp: Set delay for Venus CLK resets [07/18] clk: qcom: gcc-sm4450: Set delay for Venus CLK resets [08/18] clk: qcom: gcc-sm7150: Set delay for Venus CLK resets [09/18] clk: qcom: gcc-sm8250: Set delay for Venus CLK resets [10/18] clk: qcom: gcc-sm8350: Set delay for Venus CLK resets [11/18] clk: qcom: gcc-sm8450: Set delay for Venus CLK resets [12/18] clk: qcom: gcc-sm8550: Set delay for Venus CLK resets [13/18] clk: qcom: gcc-sm8650: Set delay for Venus CLK resets [14/18] clk: qcom: videocc-sm8150: Set delay for Venus CLK resets [15/18] clk: qcom: videocc-sm8250: Set delay for Venus CLK resets [16/18] clk: qcom: videocc-sm8350: Set delay for Venus CLK resets [17/18] clk: qcom: videocc-sm8450: Set delay for Venus CLK resets [18/18] clk: qcom: videocc-sm8550: Set delay for Venus CLK resets

Commit Message

Konrad Dybcio Jan. 8, 2024, 12:32 p.m. UTC

  They do the same thing, except the last argument of the last function
call differs. Commonize them.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 drivers/clk/qcom/reset.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Comments

Bryan O'Donoghue Jan. 9, 2024, 12:29 a.m. UTC | #1

On 08/01/2024 12:32, Konrad Dybcio wrote:
> -static int
> -qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
> +static int qcom_reset_set_assert(struct reset_controller_dev *rcdev, unsigned long id,
> +			     bool assert)

Personally I'd not elongate the function declaration.

>   {
>   	struct qcom_reset_controller *rst;
>   	const struct qcom_reset_map *map;
> @@ -33,21 +33,17 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
>   	map = &rst->reset_map[id];
>   	mask = map->bitmask ? map->bitmask : BIT(map->bit);
>   
> -	return regmap_update_bits(rst->regmap, map->reg, mask, mask);
> +	return regmap_update_bits(rst->regmap, map->reg, mask, assert ? mask : 0);

and I'd probably do

u32 bits = 0;

if (assert)
     bits = mask;

regmap_update_bits(rst->regmap, map->reg, mask, bits);

because I prefer for aesthetic reasons not to do ternary inputs like that.

However its up to you to change or not.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

---
bod

diff mbox series

Patch

diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c
index e45e32804d2c..c4ac4d18829b 100644
--- a/drivers/clk/qcom/reset.c
+++ b/drivers/clk/qcom/reset.c
@@ -22,8 +22,8 @@  static int qcom_reset(struct reset_controller_dev *rcdev, unsigned long id)
 	return 0;
 }
 
-static int
-qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
+static int qcom_reset_set_assert(struct reset_controller_dev *rcdev, unsigned long id,
+			     bool assert)
 {
 	struct qcom_reset_controller *rst;
 	const struct qcom_reset_map *map;
@@ -33,21 +33,17 @@  qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
 	map = &rst->reset_map[id];
 	mask = map->bitmask ? map->bitmask : BIT(map->bit);
 
-	return regmap_update_bits(rst->regmap, map->reg, mask, mask);
+	return regmap_update_bits(rst->regmap, map->reg, mask, assert ? mask : 0);
 }
 
-static int
-qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
+static int qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
 {
-	struct qcom_reset_controller *rst;
-	const struct qcom_reset_map *map;
-	u32 mask;
-
-	rst = to_qcom_reset_controller(rcdev);
-	map = &rst->reset_map[id];
-	mask = map->bitmask ? map->bitmask : BIT(map->bit);
+	return qcom_reset_set_assert(rcdev, id, true);
+}
 
-	return regmap_update_bits(rst->regmap, map->reg, mask, 0);
+static int qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
+{
+	return qcom_reset_set_assert(rcdev, id, false);
 }
 
 const struct reset_control_ops qcom_reset_ops = {