clk: qcom: reset: Commonize the de/assert functions

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

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240105-topic-venus_reset-v2-2-c37eba13b5ce@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c
index e45e32804d2c75aa5e5a1bf11be76e3d422b140b..20d1d35aaf2294190a09cc86307e1b8c6418e6e3 100644 (file)
--- 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 = {