From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: grant.likely@linaro.org, robh+dt@kernel.org,
devicetree@vger.kernel.org, f.fainelli@gmail.com,
netdev@vger.kernel.org, frowand.list@gmail.com
Subject: [PATCH 1/2] of_mdio: use IS_ERR_OR_NULL()
Date: Sat, 12 Mar 2016 01:12:48 +0300 [thread overview]
Message-ID: <3305414.rAFdOb57tB@wasted.cogentembedded.com> (raw)
In-Reply-To: <4882738.uyje2ICxKW@wasted.cogentembedded.com>
IS_ERR_OR_NULL() is open coded in of_mdiobus_register_{phy|device}(), so
just call it directly...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
drivers/of/of_mdio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: net-next/drivers/of/of_mdio.c
===================================================================
--- net-next.orig/drivers/of/of_mdio.c
+++ net-next/drivers/of/of_mdio.c
@@ -56,7 +56,7 @@ static int of_mdiobus_register_phy(struc
phy = phy_device_create(mdio, addr, phy_id, 0, NULL);
else
phy = get_phy_device(mdio, addr, is_c45);
- if (!phy || IS_ERR(phy))
+ if (IS_ERR_OR_NULL(phy))
return 1;
rc = irq_of_parse_and_map(child, 0);
@@ -98,7 +98,7 @@ static int of_mdiobus_register_device(st
int rc;
mdiodev = mdio_device_create(mdio, addr);
- if (!mdiodev || IS_ERR(mdiodev))
+ if (IS_ERR_OR_NULL(mdiodev))
return 1;
/* Associate the OF node with the device structure so it
next prev parent reply other threads:[~2016-03-11 22:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-11 22:11 [PATCH 0/2] of_mdio: use IS_ERR_OR_NULL() and PTR_ERR_OR_ZERO() Sergei Shtylyov
2016-03-11 22:12 ` Sergei Shtylyov [this message]
2016-03-11 22:48 ` [PATCH 1/2] of_mdio: use IS_ERR_OR_NULL() Florian Fainelli
[not found] ` <3305414.rAFdOb57tB-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org>
2016-03-11 22:53 ` Vladimir Zapolskiy
2016-03-11 23:03 ` Florian Fainelli
2016-03-11 22:13 ` [PATCH 2/2] of_mdio: use PTR_ERR_OR_ZERO() Sergei Shtylyov
2016-03-11 22:49 ` Florian Fainelli
2016-03-11 23:02 ` Vladimir Zapolskiy
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=3305414.rAFdOb57tB@wasted.cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=grant.likely@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@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).