From nobody Fri Dec 19 20:14:10 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A89435D8E4; Sun, 24 Mar 2024 23:51:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324319; cv=none; b=lUEHNglFoc7NOqHrG6/BRuqDc8rA/20SRfmLxTi0EXfCzHYYn3ZEJbiqLzfwStGuBmmFUUnXLIFQnMKktpeTdxmdcWUWY0La3gEfVxRQCon3czEwZlh2H+AsaH8OQPMy3LFWvq/ltCjPIR7T9p2s64lwUEazBuGPhzdyqN1jPXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324319; c=relaxed/simple; bh=scI6lGnl7mC+3v3Tva6fJDWXp2yAMb5siCGv3tnO+S0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c9mke9EH5487V1GSblps4DEvdfXiWXdBKJ27/xxd7ArhpAVtZ6hm0Lp7PMUmAWEeyWAqS1JpgV/xIKGLWmL37A2nrpbMXVmBWKpNHoX73e9HV8+LygjeUpNILa7IPjbhSwuqnKEMd5Kh2MLWXXmMiYkUqQlxuC/nQsGi7DJlCKU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UfZhh0rJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UfZhh0rJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 697BBC43390; Sun, 24 Mar 2024 23:51:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324319; bh=scI6lGnl7mC+3v3Tva6fJDWXp2yAMb5siCGv3tnO+S0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UfZhh0rJwJbuHVV5ZRs8ERUN1ejJq5YR9VRTVZ0ww0EBVa7bWrusROXPK9GL5xAR/ 7nq6lvP9iJk2wBt69KnELM96b85GZ99w8+8SEBa9dDwoBZ6B8u9cfaBl6mHcSWhlGW yXKIB6GRg3adk2AUsMb34x9noVQSFEk0x3ve8sQY4YiT0T6o9JUpcnS6+PBwbWA8P/ 0mO/X5Vsr/Ls0ZLYi8GgraJTdMkoJ98xAufhUE0r350vmXSrZYDm5VcPJ85mjX4s/D uXhzNJ+ehPHE2efRJzqdtFVBfHpFv9sWDwjZJMb6Vnnd3oOeP+GSHypz6wrpnoJq8Q xKt89wiM9U6zQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konrad Dybcio , Bryan O'Donoghue , Bjorn Andersson , Sasha Levin Subject: [PATCH 4.19 090/148] clk: qcom: reset: Commonize the de/assert functions Date: Sun, 24 Mar 2024 19:49:14 -0400 Message-ID: <20240324235012.1356413-91-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324235012.1356413-1-sashal@kernel.org> References: <20240324235012.1356413-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Konrad Dybcio [ Upstream commit eda40d9c583e95e0b6ac69d2950eec10f802e0e8 ] They do the same thing, except the last argument of the last function call differs. Commonize them. Reviewed-by: Bryan O'Donoghue Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20240105-topic-venus_reset-v2-2-c37eba13b5c= e@linaro.org Signed-off-by: Bjorn Andersson Stable-dep-of: 2f8cf2c3f3e3 ("clk: qcom: reset: Ensure write completion on = reset de/assertion") Signed-off-by: Sasha Levin --- drivers/clk/qcom/reset.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c index 60b60631c3445..252d7abf577e3 100644 --- a/drivers/clk/qcom/reset.c +++ b/drivers/clk/qcom/reset.c @@ -29,8 +29,8 @@ static int qcom_reset(struct reset_controller_dev *rcdev,= unsigned long id) return 0; } =20 -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; @@ -40,21 +40,17 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, u= nsigned long id) map =3D &rst->reset_map[id]; mask =3D map->bitmask ? map->bitmask : BIT(map->bit); =20 - return regmap_update_bits(rst->regmap, map->reg, mask, mask); + return regmap_update_bits(rst->regmap, map->reg, mask, assert ? mask : 0); } =20 -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 =3D to_qcom_reset_controller(rcdev); - map =3D &rst->reset_map[id]; - mask =3D map->bitmask ? map->bitmask : BIT(map->bit); + return qcom_reset_set_assert(rcdev, id, true); +} =20 - return regmap_update_bits(rst->regmap, map->reg, mask, 0); +static int qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigne= d long id) +{ + return qcom_reset_set_assert(rcdev, id, false); } =20 const struct reset_control_ops qcom_reset_ops =3D { --=20 2.43.0