From patchwork Mon Mar 13 18:33:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13173099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00424C6FD19 for ; Mon, 13 Mar 2023 18:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=UK1+he/bOexyiFgyApdReo1YGPOObfHyYZbF+tXEtTw=; b=SVkSbGTt0w4M24 WSY/h9WJ8+Wh6whFPeTo6lr1zAMR5rRT2eUjfekUB8rLoc2M+cIsn9VzDIKmNu7nRJhEtU+5s3v3J /E3iMbEcErFCuCx29LWLf86MhIvTB3beSpD15mbPZdqMmfhGFqm5FkPLL660z31tqQoYWG2UVNH8P O1T+Djk4MzyiPrF22YRNM/ah4bkSbMnKhhS8woZCXP9gi7vUerffRLWpyzEArr+UaQN+PcqPMxO4v VI3IhQt9HZMqHo6qdWqzADF1LGBGSLgWNc56hMCpT/Qo+DtNf2KurCUfBwLjqcAwzBbmx/Hpr3dki gFq23q3zhlGosjMx9S5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbmzq-007Joj-Ug; Mon, 13 Mar 2023 18:34:11 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbmzn-007Jnn-BM for linux-arm-kernel@lists.infradead.org; Mon, 13 Mar 2023 18:34:08 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pbmzc-0002bb-VG; Mon, 13 Mar 2023 19:33:57 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pbmza-003uNV-KW; Mon, 13 Mar 2023 19:33:54 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pbmzZ-004cQx-UM; Mon, 13 Mar 2023 19:33:53 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Oleksij Rempel , Shawn Guo , Sascha Hauer Cc: Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] i2c: imx: Simplify using devm_clk_get_enabled() Date: Mon, 13 Mar 2023 19:33:49 +0100 Message-Id: <20230313183349.2774002-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2091; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=iuWxsMV5rOClvmBAV4ga7wcYG62x6f4yTucQFtkyAQc=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBkD2yJQ0764DgHGejeJm32Z5cPkxvdHum/cINGm K5ttbe0aPaJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCZA9siQAKCRDB/BR4rcrs CbBrCACQ3IwA7sunR7Nn7sua8Y+ccqyZBAmslXcmGvU3s03gQIAI9KBS7GSdBGg4J5NPlue8fjf REvRCd9c7iyxbciYikN2vHaXk8RatFGKpFffFsG+Zxr+VHHarQLj940s8GTD0EVDmUl3P4RvVUG KqNYectmZpxm66890XQvg/6wa9h7eUrdZ0ryhiHQ3lsLcBa8ZgzlISXORfgnXSJv+EqNJMdQpiQ 4gGkN/7uUOJRPNHzDXf/XSpMkMazLfWGAgymaVSao46Gk9cgXO1f6W1gA57N75G+0FUIApDwK73 fdE2wIyRw0kz/o50dfdXv4vlZ3tdWUFU5cwspW00uWjvPL7K X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230313_113407_408975_CAAD8DFE X-CRM114-Status: GOOD ( 11.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org devm_clk_get_enabled() returns the clk already (prepared and) enabled and the automatically called cleanup cares for disabling (and unpreparing). So simplify .probe() and .remove() accordingly. Signed-off-by: Uwe Kleine-König Acked-by: Oleksij Rempel --- drivers/i2c/busses/i2c-imx.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) base-commit: eeac8ede17557680855031c6f305ece2378af326 diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index cf5bacf3a488..42189a5f2905 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -1482,17 +1482,11 @@ static int i2c_imx_probe(struct platform_device *pdev) ACPI_COMPANION_SET(&i2c_imx->adapter.dev, ACPI_COMPANION(&pdev->dev)); /* Get I2C clock */ - i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); + i2c_imx->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(i2c_imx->clk)) return dev_err_probe(&pdev->dev, PTR_ERR(i2c_imx->clk), "can't get I2C clock\n"); - ret = clk_prepare_enable(i2c_imx->clk); - if (ret) { - dev_err(&pdev->dev, "can't enable I2C clock, ret=%d\n", ret); - return ret; - } - /* Init queue */ init_waitqueue_head(&i2c_imx->queue); @@ -1564,7 +1558,6 @@ static int i2c_imx_probe(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); - clk_disable_unprepare(i2c_imx->clk); return ret; } @@ -1590,7 +1583,6 @@ static int i2c_imx_remove(struct platform_device *pdev) imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IFDR); imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2CR); imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2SR); - clk_disable(i2c_imx->clk); } clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb); @@ -1598,8 +1590,6 @@ static int i2c_imx_remove(struct platform_device *pdev) if (irq >= 0) free_irq(irq, i2c_imx); - clk_unprepare(i2c_imx->clk); - pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev);