From: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: Wolfram Sang <wsa@kernel.org>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH v4 3/6] i2c: mpc: Use devm_clk_get_optional()
Date: Thu, 15 Apr 2021 10:33:22 +1200 [thread overview]
Message-ID: <20210414223325.23352-4-chris.packham@alliedtelesis.co.nz> (raw)
In-Reply-To: <20210414223325.23352-1-chris.packham@alliedtelesis.co.nz>
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
The peripheral clock is optional and we may get an -EPROBE_DEFER error code
which would not be propagated correctly, fix this by using
devm_clk_get_optional().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
drivers/i2c/busses/i2c-mpc.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 37244138875a..d2209c04f67a 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -737,17 +737,18 @@ static int fsl_i2c_probe(struct platform_device *op)
* enable clock for the I2C peripheral (non fatal),
* keep a reference upon successful allocation
*/
- clk = devm_clk_get(&op->dev, NULL);
- if (!IS_ERR(clk)) {
- err = clk_prepare_enable(clk);
- if (err) {
- dev_err(&op->dev, "failed to enable clock\n");
- return err;
- } else {
- i2c->clk_per = clk;
- }
+ clk = devm_clk_get_optional(&op->dev, NULL);
+ if (IS_ERR(clk))
+ return PTR_ERR(clk);
+
+ err = clk_prepare_enable(clk);
+ if (err) {
+ dev_err(&op->dev, "failed to enable clock\n");
+ return err;
}
+ i2c->clk_per = clk;
+
if (of_property_read_bool(op->dev.of_node, "fsl,preserve-clocking")) {
clock = MPC_I2C_CLOCK_PRESERVE;
} else {
@@ -791,8 +792,7 @@ static int fsl_i2c_probe(struct platform_device *op)
return 0;
fail_add:
- if (i2c->clk_per)
- clk_disable_unprepare(i2c->clk_per);
+ clk_disable_unprepare(i2c->clk_per);
return result;
};
@@ -803,8 +803,7 @@ static int fsl_i2c_remove(struct platform_device *op)
i2c_del_adapter(&i2c->adap);
- if (i2c->clk_per)
- clk_disable_unprepare(i2c->clk_per);
+ clk_disable_unprepare(i2c->clk_per);
return 0;
};
--
2.31.1
next prev parent reply other threads:[~2021-04-14 22:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 22:33 [PATCH v4 0/6] i2c: mpc: Refactor to improve responsiveness Chris Packham
2021-04-14 22:33 ` [PATCH v4 1/6] i2c: mpc: Interrupt driven transfer Chris Packham
2021-04-14 22:33 ` [PATCH v4 2/6] i2c: mpc: Update license and copyright Chris Packham
2021-04-14 22:33 ` Chris Packham [this message]
2021-04-14 22:33 ` [PATCH v4 4/6] i2c: mpc: Remove CONFIG_PM_SLEEP ifdeffery Chris Packham
2021-04-14 22:33 ` [PATCH v4 5/6] i2c: mpc: Use device_get_match_data() helper Chris Packham
2021-04-14 22:33 ` [PATCH v4 6/6] i2c: mpc: Drop duplicate message from devm_platform_ioremap_resource() Chris Packham
2021-04-15 20:09 ` [PATCH v4 0/6] i2c: mpc: Refactor to improve responsiveness Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414223325.23352-4-chris.packham@alliedtelesis.co.nz \
--to=chris.packham@alliedtelesis.co.nz \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).