From patchwork Mon Mar 9 22:12:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11428159 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 04D3914B7 for ; Mon, 9 Mar 2020 22:12:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D007E2465A for ; Mon, 9 Mar 2020 22:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583791960; bh=h8sakRMv+8CrKCgzzo0hVw4JtHbhRi2pD9uJg0Qwmcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IQK+XZENfQjJZ0zmYx17sHV2sxwNBxdkKdhMnoUwOUs42rvSSfN4yp10BJerBlhGP BA/rOa1VjQE9Wg7zb60p6ly/TsXIlg/tDj7eQ7hvxf4ye8+oFBiIhCLvs0V1M++Ojk w7LnXkC8w6enD+Bf5GN55D2XtroRQCc/0BS8NiDQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727226AbgCIWMe (ORCPT ); Mon, 9 Mar 2020 18:12:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:55866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726937AbgCIWMe (ORCPT ); Mon, 9 Mar 2020 18:12:34 -0400 Received: from mail.kernel.org (unknown [104.132.0.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 72B1624670; Mon, 9 Mar 2020 22:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583791953; bh=h8sakRMv+8CrKCgzzo0hVw4JtHbhRi2pD9uJg0Qwmcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s9WOrBjWKLT56MoLZT4EI7kxCaZi3nZFVGmh14/1ZCqfcP7F2wnx34Rm7BwTsFioU K+j0KBVwGz8j4ewCUdgxGDoaB0AvofWSpET39X4NPhwFDjiHIXscm9ziY6JrphkQKK Q9MB6uexbKRWK2HDnMC2SlMmRe1PgihkjKME8X8Y= From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Bjorn Andersson , Taniya Das Subject: [PATCH 1/2] clk: qcom: rpmh: Simplify clk_rpmh_bcm_send_cmd() Date: Mon, 9 Mar 2020 15:12:31 -0700 Message-Id: <20200309221232.145630-2-sboyd@kernel.org> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog In-Reply-To: <20200309221232.145630-1-sboyd@kernel.org> References: <20200309221232.145630-1-sboyd@kernel.org> MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org This function has some duplication in unlocking a mutex and returns in a few different places. Let's use some if statements to consolidate code and make this a bit easier to read. Cc: Bjorn Andersson CC: Taniya Das Signed-off-by: Stephen Boyd --- drivers/clk/qcom/clk-rpmh.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index bfc29aec3a78..b1b277b55682 100644 --- a/drivers/clk/qcom/clk-rpmh.c +++ b/drivers/clk/qcom/clk-rpmh.c @@ -259,38 +259,33 @@ static int clk_rpmh_bcm_send_cmd(struct clk_rpmh *c, bool enable) { struct tcs_cmd cmd = { 0 }; u32 cmd_state; - int ret; + int ret = 0; mutex_lock(&rpmh_clk_lock); - - cmd_state = 0; if (enable) { cmd_state = 1; if (c->aggr_state) cmd_state = c->aggr_state; + } else { + cmd_state = 0; } - if (c->last_sent_aggr_state == cmd_state) { - mutex_unlock(&rpmh_clk_lock); - return 0; - } - - cmd.addr = c->res_addr; - cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state); + if (c->last_sent_aggr_state != cmd_state) { + cmd.addr = c->res_addr; + cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state); - ret = clk_rpmh_send(c, RPMH_ACTIVE_ONLY_STATE, &cmd, enable); - if (ret) { - dev_err(c->dev, "set active state of %s failed: (%d)\n", - c->res_name, ret); - mutex_unlock(&rpmh_clk_lock); - return ret; + ret = clk_rpmh_send(c, RPMH_ACTIVE_ONLY_STATE, &cmd, enable); + if (ret) { + dev_err(c->dev, "set active state of %s failed: (%d)\n", + c->res_name, ret); + } else { + c->last_sent_aggr_state = cmd_state; + } } - c->last_sent_aggr_state = cmd_state; - mutex_unlock(&rpmh_clk_lock); - return 0; + return ret; } static int clk_rpmh_bcm_prepare(struct clk_hw *hw) From patchwork Mon Mar 9 22:12:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11428157 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9200139A for ; Mon, 9 Mar 2020 22:12:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9FA6A24673 for ; Mon, 9 Mar 2020 22:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583791960; bh=GzADGU/Q3vjNfc3qU133TiVe59BHAmKdHYoUdA2U4MY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wFN+QaLdGFS/bAuwP4tAcVDac0Qro6gEEFg0e2fTvWodr1i+vdl5DozMpNTd3r4eT FrMbkkebqt7glokfXw2r177mMu+aimaeu2EUD+JlLKGHHoJ6eiidcQwD0MD/1KCpSs glpwE35wqGWPRDeHoknNowOpQ6+qXBlegcjWn+AI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727224AbgCIWMe (ORCPT ); Mon, 9 Mar 2020 18:12:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:55870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726536AbgCIWMe (ORCPT ); Mon, 9 Mar 2020 18:12:34 -0400 Received: from mail.kernel.org (unknown [104.132.0.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C51B824673; Mon, 9 Mar 2020 22:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583791954; bh=GzADGU/Q3vjNfc3qU133TiVe59BHAmKdHYoUdA2U4MY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YP9/FeNCVMoh0jQChEYBLM2pUDwD4+4EMT87yxgaEzttLFQ82yQinmICxR1B0vwu7 LxDjBoKMxfl9OGJ83/9R+45TlMkQV7Bzg7n9vTsselku8pPIS1EPR87HMzGDnSFTUP v+z3pZLFOvR1/6VUgZKI4U46MCU1ybB0gFh59/xg= From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Bjorn Andersson , Taniya Das Subject: [PATCH 2/2] clk: qcom: rpmh: Drop unnecessary semicolons Date: Mon, 9 Mar 2020 15:12:32 -0700 Message-Id: <20200309221232.145630-3-sboyd@kernel.org> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog In-Reply-To: <20200309221232.145630-1-sboyd@kernel.org> References: <20200309221232.145630-1-sboyd@kernel.org> MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Some functions end in }; which is just bad style. Remove the extra semicolon. Cc: Bjorn Andersson Cc: Taniya Das Signed-off-by: Stephen Boyd --- drivers/clk/qcom/clk-rpmh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c index b1b277b55682..e2c669b08aff 100644 --- a/drivers/clk/qcom/clk-rpmh.c +++ b/drivers/clk/qcom/clk-rpmh.c @@ -227,7 +227,7 @@ static int clk_rpmh_prepare(struct clk_hw *hw) mutex_unlock(&rpmh_clk_lock); return ret; -}; +} static void clk_rpmh_unprepare(struct clk_hw *hw) { @@ -293,14 +293,14 @@ static int clk_rpmh_bcm_prepare(struct clk_hw *hw) struct clk_rpmh *c = to_clk_rpmh(hw); return clk_rpmh_bcm_send_cmd(c, true); -}; +} static void clk_rpmh_bcm_unprepare(struct clk_hw *hw) { struct clk_rpmh *c = to_clk_rpmh(hw); clk_rpmh_bcm_send_cmd(c, false); -}; +} static int clk_rpmh_bcm_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) @@ -316,7 +316,7 @@ static int clk_rpmh_bcm_set_rate(struct clk_hw *hw, unsigned long rate, clk_rpmh_bcm_send_cmd(c, true); return 0; -}; +} static long clk_rpmh_round_rate(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate)