Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wan Jiabing <wanjiabing@vivo.com>
To:     Hugues Fruchet <hugues.fruchet@foss.st.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Wan Jiabing <wanjiabing@vivo.com>
Subject: [PATCH] [media] st-delta: Remove unneeded NULL check in delta-v4l2
Date:   Mon, 16 May 2022 21:13:30 +0800
Message-Id: <20220516131330.13970-1-wanjiabing@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nfLu+4FdO2+75uSmAPfs350YCkC8yLi7KcDO6bPDm1VzuWcv1Fgj9q9UswEv?=
 =?us-ascii?Q?ZMC6daq0fyF5R02MDaCS7bnJixo1myd6Ke7HUW5HWXhtPij8GbzLmwBdlsjD?=
 =?us-ascii?Q?ktQi3KXzOyJBh958MP+7JIRrP++GE7UfaFE8ClQK+B4ldd5tjPtaTOUQNE26?=
 =?us-ascii?Q?UIyMkB7/wVMfXBoOs1RZKp+jTijT6Jp4Yx47Z0IDNqTkXUvPCZxqek91viva?=
 =?us-ascii?Q?xS4VaejImNi9LtTQOLNjZRWgCmPNCH28Vm/wDZJWHLC9JJAPC78HzZmLfNVA?=
 =?us-ascii?Q?SvaOQBD+fwV1Ax+NEN6Z2zZe1ztqLH+EoVNNEDqCSF9/U3g1Jwt8FWOAEwpm?=
 =?us-ascii?Q?aDRvCS2pcojgnCcpYriwWpDfk42B1z5yhUzOkcwhrPtOwuTtz3P4RIXsv9QV?=
 =?us-ascii?Q?9wEgi79aRNMOkRredsiWJBZbSm7YtFlOctdHnbldEeaSpSoTbnWweRV76WFD?=
 =?us-ascii?Q?zDOFHcvDvroTiZB3REqWkKOMWpw+smW1YOzgkKvrtt4x/ERO7sHQEqp7+2dq?=
 =?us-ascii?Q?dOW9rH4t8gIWWFmo09yN5UkYUkvHjGKRjDWjZHZ+whO0HQ45pwzBHphBy3X8?=
 =?us-ascii?Q?JRpx2Chws2gZ0E8NLz21ZtAhPs73GQ2Vnle0sli4VsAd7qRP8hgtlU0eZgIA?=
 =?us-ascii?Q?6sxKNt7W3wyGzHdn8w0PcgPJWFUKxZhI2zMAfqGrAy8+SuU0nQ4peI3QS2Yd?=
 =?us-ascii?Q?yQvluxyPijsx+t+tHKSnssS2BHAq5ro97csobTN6lM1LX7K9Y13AyCiy2evb?=
 =?us-ascii?Q?8Bxolvrk9h1Uw5+qwi5Bc9PU7z/chuo59rKE3Ew8H33Fa5M+bqo+u63P8O0V?=
 =?us-ascii?Q?uIIsOKeiMlAr74+xshXjIKPDL4DiKBk0vW1C2X0PtRi5EuyLzmUpeIGEjPc2?=
 =?us-ascii?Q?4D4+FRVcRKdJ7zl0Wk71MLxwZ1aQgx3q6Hzp6zvfoQSWzAavZhPV5f0Y7T3o?=
 =?us-ascii?Q?KYox9ncgVFIMWEWYYp8hhPl8M2cjvL0CYlKYBc1o30epY3OEuCT36Sn19AKO?=
 =?us-ascii?Q?QjXvWHeDaNfOHlWwXtrOZ6AWm3sfHzU0Qr3yQPxIapg14ibMEt4ci5r+c+9P?=
 =?us-ascii?Q?TQ+9XMoKhVLzZIJdtBV95fpvH6hKzdC51PVBjpUEJMGiNjwqHqLnYKWsJcDc?=
 =?us-ascii?Q?z6CJYUQCksZFVYLouoajigBUa+YQIqsaMNSvrvTOHYF5VSe9UfssgYAWKvHz?=
 =?us-ascii?Q?QoS9TLr2T1+gSx0JmH9qBfhgI/Z/byD95bfa5Tk7iAs1wg7GZ5whHoqjSxr1?=
 =?us-ascii?Q?sP+P+nIwimtlQEKzEUt2LwKCz40DnTLYiWErCkFhOCuwERcx2xWD1S/34NpZ?=
 =?us-ascii?Q?nSYCrgnkKRg9Z2kHhgAk0KoKWKUHHntjzfua0E6x1GkcisJLTms+rR9GYZZY?=
 =?us-ascii?Q?yvgx6HrW290VcsYbXrVk+1B7O6VnCk/3tsoqNcByiFbAXx61SdP/EwrRuOoI?=
 =?us-ascii?Q?/3xbkRabi1pIgC7WwfT1+KatMNoAwpIEblInyKFfrDm71rU8tSPvwhiSL2nd?=
 =?us-ascii?Q?ui59ZFLXajAc8NxBsj7u//gyLl+6siAED9xwKic+gf/7d7Lv+cpvTXcMEF9A?=
 =?us-ascii?Q?QD7kIBpvmzLeDmLkJkVWMe2zcmfNbfd39hcCzwFog9eQBnp5X2BXv4T9Tovu?=
 =?us-ascii?Q?cCCkqKlh4KdWHvqxmhbLlfJn1+rhIjvLKj9uUj03Wj5ocOWkhDqd/txfC9z6?=
 =?us-ascii?Q?ZBYiCdKTUUEDYKQMt1IZ19DDF/hv5ulFuvhcg96o4Tdmx8lRCZ+NOOGYiTY8?=
 =?us-ascii?Q?+6DKT6isYQ=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7dd0fd11-7dd7-4200-3105-08da373de623
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3367.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 13:13:42.1976
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: uug9WOyxGQxWBxeFLJM2XOFUr7oRcOo+bRIjPSlTxXVcfXKDGKCEhdtEEyy/XrNFm7T31wCPAydfU+A8Jn3xzw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5112
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

clk_prepare_enable() already checks NULL by using !clk.
clk_disable_unprepare() already checks NULL by using IS_ERR_OR_NULL.
Remove unneeded NULL checks before them.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 .../media/platform/st/sti/delta/delta-v4l2.c  | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/drivers/media/platform/st/sti/delta/delta-v4l2.c b/drivers/media/platform/st/sti/delta/delta-v4l2.c
index 420ad4d8df5d..03eaee6d15da 100644
--- a/drivers/media/platform/st/sti/delta/delta-v4l2.c
+++ b/drivers/media/platform/st/sti/delta/delta-v4l2.c
@@ -1669,14 +1669,12 @@ static int delta_open(struct file *file)
 	set_default_params(ctx);
 
 	/* enable ST231 clocks */
-	if (delta->clk_st231)
-		if (clk_prepare_enable(delta->clk_st231))
-			dev_warn(delta->dev, "failed to enable st231 clk\n");
+	if (clk_prepare_enable(delta->clk_st231))
+		dev_warn(delta->dev, "failed to enable st231 clk\n");
 
 	/* enable FLASH_PROMIP clock */
-	if (delta->clk_flash_promip)
-		if (clk_prepare_enable(delta->clk_flash_promip))
-			dev_warn(delta->dev, "failed to enable delta promip clk\n");
+	if (clk_prepare_enable(delta->clk_flash_promip))
+		dev_warn(delta->dev, "failed to enable delta promip clk\n");
 
 	mutex_unlock(&delta->lock);
 
@@ -1717,12 +1715,10 @@ static int delta_release(struct file *file)
 	v4l2_fh_exit(&ctx->fh);
 
 	/* disable ST231 clocks */
-	if (delta->clk_st231)
-		clk_disable_unprepare(delta->clk_st231);
+	clk_disable_unprepare(delta->clk_st231);
 
 	/* disable FLASH_PROMIP clock */
-	if (delta->clk_flash_promip)
-		clk_disable_unprepare(delta->clk_flash_promip);
+	clk_disable_unprepare(delta->clk_flash_promip);
 
 	dev_dbg(delta->dev, "%s decoder instance released\n", ctx->name);
 
@@ -1926,8 +1922,7 @@ static int delta_runtime_suspend(struct device *dev)
 {
 	struct delta_dev *delta = dev_get_drvdata(dev);
 
-	if (delta->clk_delta)
-		clk_disable_unprepare(delta->clk_delta);
+	clk_disable_unprepare(delta->clk_delta);
 
 	return 0;
 }
@@ -1936,9 +1931,8 @@ static int delta_runtime_resume(struct device *dev)
 {
 	struct delta_dev *delta = dev_get_drvdata(dev);
 
-	if (delta->clk_delta)
-		if (clk_prepare_enable(delta->clk_delta))
-			dev_warn(dev, "failed to prepare/enable delta clk\n");
+	if (clk_prepare_enable(delta->clk_delta))
+		dev_warn(dev, "failed to prepare/enable delta clk\n");
 
 	return 0;
 }
-- 
2.36.1