From mboxrd@z Thu Jan 1 00:00:00 1970 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 5F8A72D6635 for ; Wed, 30 Jul 2025 14:00:07 +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=1753884008; cv=none; b=RPzOaz6KPLA3iwqF2F4Z9pgITF/MPacyYMKYWlGhN4KTuFFCloWOnoUVMTzRJkh5p3WwoadPC3EqB3qtHF8nBnl1hntAMr8bPeYaMRpK5b13w/HpneY2PJpsjMQZuhz4PDNk0PglTCM+XuNt8MxAFURkdeC3T4u223pVs16fKek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753884008; c=relaxed/simple; bh=Bgi0HosXOc/2KM8KZJF4+yK300ocUpd+lflVYMj5d5s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=o8q3E0bV5vTm4a9Lj+pSzhrbu54AZirqvMfqhKXfppCE86ZlhX8tuJizl8BC6phFjmJ+OwpN/zARsagoUQpVLkIwcXNlKXeCQ3kfGSNMGSG/ZVQVobqpRtGh/BpxlqkEacvS4N+gB+bEUYw4WMyEXjxlHG5fB45bpVJfBNyO83Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jgGgknfD; 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="jgGgknfD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3B87C4CEE3; Wed, 30 Jul 2025 14:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753884007; bh=Bgi0HosXOc/2KM8KZJF4+yK300ocUpd+lflVYMj5d5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jgGgknfDzBtac51OXOvMOY3Of/iZ/R2vZ26Y5848C/oJkedcbvJAMOwdx3lZ2vuR4 TGbrIZ4ooIIoSJXUWZr0z240x1nSOz2ePo9tjJhrfRvRoTqrWEQfpVRGhbfcQVQtfz ajHGv/zwrEmMFzJYtMLrgAXebMMslQSJmQvX+ftI40KtvlAsdqQrkyqs0k2GVIqQ3U SNZgr+2MbnbWv8C5M7Oy21HuIeO0q5C7QevQAOdf1mX5039epWsD7i1xs4BLImBHfr AhxLCoAH9mhbdUvenkd7rhPE+jg2ebhY4YwMGzUS4OZeDdpPe/ZS5YvUH9ZlwtinYN ouf+E1YsqvuhA== From: Sasha Levin To: stable@vger.kernel.org Cc: Andi Shyti , Alain Volmat , Wolfram Sang , Sasha Levin Subject: [PATCH 6.6.y v2 1/5] i2c: stm32f7: Use devm_clk_get_enabled() Date: Wed, 30 Jul 2025 09:59:58 -0400 Message-Id: <20250730140002.3814528-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <2025072104-bacteria-resend-dcff@gregkh> References: <2025072104-bacteria-resend-dcff@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Andi Shyti [ Upstream commit 7ba2b17a87466e1410ae0ccc94d8eb381de177c2 ] Replace the pair of functions, devm_clk_get() and clk_prepare_enable(), with a single function devm_clk_get_enabled(). Signed-off-by: Andi Shyti Acked-by: Alain Volmat Signed-off-by: Wolfram Sang Stable-dep-of: 6aae87fe7f18 ("i2c: stm32f7: unmap DMA mapped buffer") Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-stm32f7.c | 37 +++++++++++--------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index 85f8fd6a21ec..cd9c6ffc2e61 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -2177,23 +2177,16 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) i2c_dev->wakeup_src = of_property_read_bool(pdev->dev.of_node, "wakeup-source"); - i2c_dev->clk = devm_clk_get(&pdev->dev, NULL); + i2c_dev->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(i2c_dev->clk)) return dev_err_probe(&pdev->dev, PTR_ERR(i2c_dev->clk), - "Failed to get controller clock\n"); - - ret = clk_prepare_enable(i2c_dev->clk); - if (ret) { - dev_err(&pdev->dev, "Failed to prepare_enable clock\n"); - return ret; - } + "Failed to enable controller clock\n"); rst = devm_reset_control_get(&pdev->dev, NULL); - if (IS_ERR(rst)) { - ret = dev_err_probe(&pdev->dev, PTR_ERR(rst), - "Error: Missing reset ctrl\n"); - goto clk_free; - } + if (IS_ERR(rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(rst), + "Error: Missing reset ctrl\n"); + reset_control_assert(rst); udelay(2); reset_control_deassert(rst); @@ -2208,7 +2201,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Failed to request irq event %i\n", irq_event); - goto clk_free; + return ret; } ret = devm_request_irq(&pdev->dev, irq_error, stm32f7_i2c_isr_error, 0, @@ -2216,29 +2209,28 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Failed to request irq error %i\n", irq_error); - goto clk_free; + return ret; } setup = of_device_get_match_data(&pdev->dev); if (!setup) { dev_err(&pdev->dev, "Can't get device data\n"); - ret = -ENODEV; - goto clk_free; + return -ENODEV; } i2c_dev->setup = *setup; ret = stm32f7_i2c_setup_timing(i2c_dev, &i2c_dev->setup); if (ret) - goto clk_free; + return ret; /* Setup Fast mode plus if necessary */ if (i2c_dev->bus_rate > I2C_MAX_FAST_MODE_FREQ) { ret = stm32f7_i2c_setup_fm_plus_bits(pdev, i2c_dev); if (ret) - goto clk_free; + return ret; ret = stm32f7_i2c_write_fm_plus_bits(i2c_dev, true); if (ret) - goto clk_free; + return ret; } adap = &i2c_dev->adap; @@ -2349,9 +2341,6 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) fmp_clear: stm32f7_i2c_write_fm_plus_bits(i2c_dev, false); -clk_free: - clk_disable_unprepare(i2c_dev->clk); - return ret; } @@ -2385,8 +2374,6 @@ static void stm32f7_i2c_remove(struct platform_device *pdev) } stm32f7_i2c_write_fm_plus_bits(i2c_dev, false); - - clk_disable_unprepare(i2c_dev->clk); } static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev) -- 2.39.5