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.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c
index f824dc7099ce735ee3e2d6102a37cb6d138ccc2c..ecdee838d25df711a859d005f7d82fa6b3368ac1 100644 (file)
--- a/drivers/nfc/s3fwrn5/i2c.c
+++ b/drivers/nfc/s3fwrn5/i2c.c
@@ -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[] = {