diff options
| author |   Joe Perches <joe@perches.com> | 2015-05-05 10:05:59 -0700 |
|---|---|---|
| committer |   Michael Grzeschik <m.grzeschik@pengutronix.de> | 2015-09-23 08:44:25 +0200 |
| commit | 97464eddf9fdbe02abfc44676949e07708cf557f (patch) | |
| tree | 1afc6a3ffa16ae7ea7461f3a5315bc8a13bbcae9 /drivers/net/arcnet | |
| parent | arcnet: Remove unnecessary OOM messages (diff) | |
| download | linux-dev-97464eddf9fdbe02abfc44676949e07708cf557f.tar.xz linux-dev-97464eddf9fdbe02abfc44676949e07708cf557f.zip | |
arcnet: Remove assignments from ifs
Move the assignment above the if like general kernel style.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Diffstat (limited to 'drivers/net/arcnet')
| -rw-r--r-- | drivers/net/arcnet/com20020-isa.c | 4 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020.c | 3 | ||||
| -rw-r--r-- | 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 f3b2222bcada..352500b8d875 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 e813fc619ac9..bea386222149 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 32abaa8d0dc4..11bc589aa8d1 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; |