nfc: s3fwrn5: use devm_clk_get_optional_enabled() helper
Subsystems (4)
PATCH v2 1/1 nfc: s3fwrn5: use devm_clk_get_optional_enabled() helper
Because we enable the clock immediately after acquiring it in probe, we can combine the 2 operations and use devm_clk_get_optional_enabled() helper.
---
v2: remove calls to clk_disable_unprepare() as they are not needed anymore
drivers/nfc/s3fwrn5/i2c.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/nfc/s3fwrn5/i2c.c +5 -14
@@ -209,27 +209,21 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client,if (ret <0 )return ret; - phy->clk =devm_clk_get_optional (&client->dev,NULL ); -if (IS_ERR (phy->clk)) -return dev_err_probe (&client->dev,PTR_ERR (phy->clk), -"failed to get clock\n" ); -/* * S3FWRN5 depends on a clock input ("XI" pin) to function properly. * Depending on the hardware configuration this could be an always-on * oscillator or some external clock that must be explicitly enabled. * Make sure the clock is running before starting S3FWRN5. */ - ret =clk_prepare_enable (phy->clk); -if (ret <0 ) { -dev_err (&client->dev,"failed to enable clock: %d\n" , ret); -return ret; - } + phy->clk =devm_clk_get_optional_enabled (&client->dev,NULL ); +if (IS_ERR (phy->clk)) +return dev_err_probe (&client->dev,PTR_ERR (phy->clk), +"failed to get clock\n" ); ret =s3fwrn5_probe (&phy->common.ndev, phy, &phy->i2c_dev->dev, &i2c_phy_ops);if (ret <0 ) - goto disable_clk; +return ret; ret = devm_request_threaded_irq(&client->dev, phy->i2c_dev->irq, NULL, s3fwrn5_i2c_irq_thread_fn, IRQF_ONESHOT,
@@ -241,8 +235,6 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client, s3fwrn5_remove:s3fwrn5_remove (phy->common.ndev); -disable_clk: -clk_disable_unprepare (phy->clk);return ret; }
@@ -251,7 +243,6 @@ static void s3fwrn5_i2c_remove(struct i2c_client *client)struct s3fwrn5_i2c_phy *phy =i2c_get_clientdata (client);s3fwrn5_remove (phy->common.ndev); -clk_disable_unprepare (phy->clk); }static const struct i2c_device_id s3fwrn5_i2c_id_table[] = {
Signature · 5 lines
2.38.0.135.g90850a2211-goog -- Dmitry
Quoted 7 lines · Dmitry Torokhov
Because we enable the clock immediately after acquiring it in probe, we can combine the 2 operations and use
devm_clk_get_optional_enabled()helper.Signed-off-by Dmitry Torokhov <[email protected]>---
Best regards,
Krzysztof
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 27 Oct 2022 00:34:02 -0700 you wrote:
Because we enable the clock immediately after acquiring it in probe, we can combine the 2 operations and use
devm_clk_get_optional_enabled()helper.Signed-off-by Dmitry Torokhov <[email protected]>---
[...]
Here is the summary with links:
- [net-next,v2] nfc: s3fwrn5: use devm_clk_get_optional_enabled() helper
https://git.kernel.org/netdev/net-next/c/f8f797f35a9a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html