From: Joe Perches <j...@perches.com>
Move the assignment above the if like general kernel style.
Signed-off-by: Joe Perches <j...@perches.com>
Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
---
drivers/net/arcnet/com20020-isa.c | 4 +++-
drivers/net/arcnet/com20020.c | 3 ++-
drivers/net/arcnet/com90io.c | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/arcnet/com20020-isa.c
b/drivers/net/arcnet/com20020-isa.c
index f3b2222..352500b 100644
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -107,7 +107,9 @@ static int __init com20020isa_probe(struct net_device *dev)
}
lp->card_name = "ISA COM20020";
- if ((err = com20020_found(dev, 0)) != 0)
+
+ err = com20020_found(dev, 0);
+ if (err != 0)
goto out;
return 0;
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index e813fc6..bea3862 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -140,7 +140,8 @@ int com20020_check(struct net_device *dev)
outb(0 | RDDATAflag | AUTOINCflag, _ADDR_HI);
outb(0, _ADDR_LO);
- if ((status = inb(_MEMDATA)) != TESTvalue) {
+ status = inb(_MEMDATA);
+ if (status != TESTvalue) {
arc_printk(D_NORMAL, dev, "Signature byte not found (%02Xh !=
D1h).\n",
status);
return -ENODEV;
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c
index 32abaa8..11bc589 100644
--- a/drivers/net/arcnet/com90io.c
+++ b/drivers/net/arcnet/com90io.c
@@ -196,7 +196,8 @@ static int __init com90io_probe(struct net_device *dev)
outb(AUTOINCflag, _ADDR_HI);
outb(0, _ADDR_LO);
- if ((status = inb(_MEMDATA)) != 0xd1) {
+ status = inb(_MEMDATA);
+ if (status != 0xd1) {
arc_printk(D_INIT_REASONS, dev, "Signature byte not found (%Xh
instead).\n",
status);
goto err_out;
--
2.5.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
