From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Marcin Wojtas <mw@semihalf.com>,
Russell King <linux@armlinux.org.uk>,
Jakub Kicinski <kuba@kernel.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: [PATCH net-next v1 4/4] net: mvpp2: Unshadow error code of device_property_read_u32()
Date: Mon, 10 May 2021 12:58:08 +0300 [thread overview]
Message-ID: <20210510095808.3302997-4-andy.shevchenko@gmail.com> (raw)
In-Reply-To: <20210510095808.3302997-1-andy.shevchenko@gmail.com>
device_property_read_u32() may return different error codes.
Propagate it to the caller.
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index b6b7ba891e71..9f464e44ae1b 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -7458,10 +7458,12 @@ static int mvpp2_probe(struct platform_device *pdev)
/* Get system's tclk rate */
priv->tclk = clk_get_rate(priv->pp_clk);
- } else if (device_property_read_u32(&pdev->dev, "clock-frequency",
- &priv->tclk)) {
- dev_err(&pdev->dev, "missing clock-frequency value\n");
- return -EINVAL;
+ } else {
+ err = device_property_read_u32(&pdev->dev, "clock-frequency", &priv->tclk);
+ if (err) {
+ dev_err(&pdev->dev, "missing clock-frequency value\n");
+ return err;
+ }
}
if (priv->hw_version >= MVPP22) {
--
2.31.1
next prev parent reply other threads:[~2021-05-10 9:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 9:58 [PATCH net-next v1 1/4] net: mvpp2: Put fwnode in error case during ->probe() Andy Shevchenko
2021-05-10 9:58 ` [PATCH net-next v1 2/4] net: mvpp2: Use device_get_match_data() helper Andy Shevchenko
2021-05-10 9:58 ` [PATCH net-next v1 3/4] net: mvpp2: Use devm_clk_get_optional() Andy Shevchenko
2021-05-10 9:58 ` Andy Shevchenko [this message]
2021-05-10 22:20 ` [PATCH net-next v1 1/4] net: mvpp2: Put fwnode in error case during ->probe() patchwork-bot+netdevbpf
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=20210510095808.3302997-4-andy.shevchenko@gmail.com \
--to=andy.shevchenko@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mw@semihalf.com \
--cc=netdev@vger.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